diff options
| author | bors <bors@rust-lang.org> | 2021-05-13 22:17:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-13 22:17:43 +0000 |
| commit | 17f30e5451f581d753899d2f628e5be354df33cd (patch) | |
| tree | 58252137260855f9c5791b84bda1dcdb4d90407b /compiler/rustc_builtin_macros/src/lib.rs | |
| parent | 6d395a1c2946c79966490f5b1e6e619d3a713e6b (diff) | |
| parent | a7ed6a5196996f00dd78a391a44af51ee8088058 (diff) | |
| download | rust-17f30e5451f581d753899d2f628e5be354df33cd.tar.gz rust-17f30e5451f581d753899d2f628e5be354df33cd.zip | |
Auto merge of #84107 - Amanieu:global_asm2, r=nagisa
Add support for const operands and options to global_asm! On x86, the default syntax is also switched to Intel to match asm!. Currently `global_asm!` only supports `const` operands and the `att_syntax` option. In the future, `sym` operands will also be supported. However there is no plan to support any of the other operand types or options since they don't make sense in the context of `global_asm!`. r? `@nagisa`
Diffstat (limited to 'compiler/rustc_builtin_macros/src/lib.rs')
| -rw-r--r-- | compiler/rustc_builtin_macros/src/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_builtin_macros/src/lib.rs b/compiler/rustc_builtin_macros/src/lib.rs index 65a141e1112..17b7793c7dd 100644 --- a/compiler/rustc_builtin_macros/src/lib.rs +++ b/compiler/rustc_builtin_macros/src/lib.rs @@ -37,7 +37,6 @@ mod env; mod format; mod format_foreign; mod global_allocator; -mod global_asm; mod llvm_asm; mod log_syntax; mod panic; @@ -75,7 +74,7 @@ pub fn register_builtin_macros(resolver: &mut dyn ResolverExpand) { file: source_util::expand_file, format_args_nl: format::expand_format_args_nl, format_args: format::expand_format_args, - global_asm: global_asm::expand_global_asm, + global_asm: asm::expand_global_asm, include_bytes: source_util::expand_include_bytes, include_str: source_util::expand_include_str, include: source_util::expand_include, |