New upstream version 1.20.0+dfsg1

[rustc.git] / src / librustc_back / target / openbsd_base.rs

diff --git a/src/librustc_back/target/openbsd_base.rs b/src/librustc_back/target/openbsd_base.rs
index 42220a87bd414891ea17830790cdfcdeefeaeb9d..051028d5c4a7752840887313af6e8fc6762c300e 100644 (file)
--- a/src/librustc_back/target/openbsd_base.rs
+++ b/src/librustc_back/target/openbsd_base.rs
@@ -8,21 +8,32 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use target::TargetOptions;
+use LinkerFlavor;
+use target::{LinkArgs, TargetOptions};
 use std::default::Default;
 
 pub fn opts() -> TargetOptions {
+    let mut args = LinkArgs::new();
+    args.insert(LinkerFlavor::Gcc, vec![
+        // GNU-style linkers will use this to omit linking to libraries
+        // which don't actually fulfill any relocations, but only for
+        // libraries which follow this flag.  Thus, use it before
+        // specifying libraries to link to.
+        "-Wl,--as-needed".to_string(),
+
+        // Always enable NX protection when it is available
+        "-Wl,-z,noexecstack".to_string(),
+    ]);
+
     TargetOptions {
-        linker: "cc".to_string(),
         dynamic_linking: true,
         executables: true,
-        morestack: false,
+        target_family: Some("unix".to_string()),
         linker_is_gnu: true,
         has_rpath: true,
-        pre_link_args: vec!(
-        ),
+        is_like_openbsd: true,
+        pre_link_args: args,
         position_independent_executables: true,
         .. Default::default()
     }
 }
-