about summary refs log tree commit diff
path: root/src/librustc_back/target
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-08-23 07:50:06 +0000
committerbors <bors@rust-lang.org>2015-08-23 07:50:06 +0000
commit54b2eced630655290d4d74f3da16cdac7ec67abe (patch)
tree4161d6b20d3b49df2b750fde1e9431be1742a1e5 /src/librustc_back/target
parentd530379df6ad5a43487dcfa3ea43c69b3b145940 (diff)
parent8b70e1e0080650e078c057eab311f2aa6f2e0173 (diff)
downloadrust-54b2eced630655290d4d74f3da16cdac7ec67abe.tar.gz
rust-54b2eced630655290d4d74f3da16cdac7ec67abe.zip
Auto merge of #27927 - DiamondLovesYou:no-asm, r=alexcrichton
Diffstat (limited to 'src/librustc_back/target')
-rw-r--r--src/librustc_back/target/mod.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
index 542791ae904..d5f081921ca 100644
--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
@@ -168,6 +168,8 @@ pub struct TargetOptions {
     /// currently only "gnu" is used to fall into LLVM. Unknown strings cause
     /// the system linker to be used.
     pub archive_format: String,
+    /// Is asm!() allowed? Defaults to true.
+    pub allow_asm: bool,
     /// Whether the target uses a custom unwind resumption routine.
     /// By default LLVM lowers `resume` instructions into calls to `_Unwind_Resume`
     /// defined in libgcc.  If this option is enabled, the target must provide
@@ -217,6 +219,7 @@ impl Default for TargetOptions {
             custom_unwind_resume: false,
             lib_allocation_crate: "alloc_system".to_string(),
             exe_allocation_crate: "alloc_system".to_string(),
+            allow_asm: true,
         }
     }
 }
@@ -310,6 +313,7 @@ impl Target {
         key!(no_compiler_rt, bool);
         key!(pre_link_args, list);
         key!(post_link_args, list);
+        key!(allow_asm, bool);
 
         base
     }