about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-05-13 22:17:43 +0000
committerbors <bors@rust-lang.org>2021-05-13 22:17:43 +0000
commit17f30e5451f581d753899d2f628e5be354df33cd (patch)
tree58252137260855f9c5791b84bda1dcdb4d90407b /library/std/src
parent6d395a1c2946c79966490f5b1e6e619d3a713e6b (diff)
parenta7ed6a5196996f00dd78a391a44af51ee8088058 (diff)
downloadrust-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 'library/std/src')
-rw-r--r--library/std/src/sys/sgx/abi/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/sgx/abi/mod.rs b/library/std/src/sys/sgx/abi/mod.rs
index f9536c4203d..231cc15b849 100644
--- a/library/std/src/sys/sgx/abi/mod.rs
+++ b/library/std/src/sys/sgx/abi/mod.rs
@@ -15,7 +15,7 @@ pub mod tls;
 pub mod usercalls;
 
 #[cfg(not(test))]
-global_asm!(include_str!("entry.S"));
+global_asm!(include_str!("entry.S"), options(att_syntax));
 
 #[repr(C)]
 struct EntryReturn(u64, u64);