about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-11-07 04:59:42 +0000
committerbors <bors@rust-lang.org>2021-11-07 04:59:42 +0000
commit90a273b785b3bc482b82c4896ba1bdea68745e46 (patch)
tree9cd6cd6c8bd91cc49309a564e9079e3e010d8f47 /src/doc
parent88b4ea8fb67ff5f754366157cbd98d9813253d93 (diff)
parent87d0d64b7869c9cb0be7cad957b2b3939ed15fdc (diff)
downloadrust-90a273b785b3bc482b82c4896ba1bdea68745e46.tar.gz
rust-90a273b785b3bc482b82c4896ba1bdea68745e46.zip
Auto merge of #90348 - Amanieu:asm_feature_gates, r=joshtriplett
Add features gates for experimental asm features

This PR splits off parts of `asm!` into separate features because they are not ready for stabilization.

Specifically this adds:
- `asm_const` for `const` operands.
- `asm_sym` for `sym` operands.
- `asm_experimental_arch` for architectures other than x86, x86_64, arm, aarch64 and riscv.

r? `@nagisa`
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/unstable-book/src/library-features/global-asm.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/unstable-book/src/library-features/global-asm.md b/src/doc/unstable-book/src/library-features/global-asm.md
index 146d17b4638..3f8e165841d 100644
--- a/src/doc/unstable-book/src/library-features/global-asm.md
+++ b/src/doc/unstable-book/src/library-features/global-asm.md
@@ -75,7 +75,7 @@ are concatenated into one or assembled separately.
 constants defined in Rust to be used in assembly code:
 
 ```rust,no_run
-#![feature(global_asm)]
+#![feature(global_asm, asm_const)]
 # #[cfg(any(target_arch="x86", target_arch="x86_64"))]
 # mod x86 {
 const C: i32 = 1234;
@@ -96,7 +96,7 @@ override this by adding `options(att_syntax)` at the end of the macro
 arguments list:
 
 ```rust,no_run
-#![feature(global_asm)]
+#![feature(global_asm, asm_const)]
 # #[cfg(any(target_arch="x86", target_arch="x86_64"))]
 # mod x86 {
 global_asm!("movl ${}, %ecx", const 5, options(att_syntax));