about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-16 14:51:07 +0000
committerbors <bors@rust-lang.org>2014-08-16 14:51:07 +0000
commit22b7e4dd565a7471aa4ff9f52e44df1c6c9ffdc8 (patch)
tree22cbd716856bbcace44ee2c3ed5f9df0a58f59fc
parent78ec3904b443c818d9f83e837ca13e5f197db740 (diff)
parentd3c71a5890b8f8a9e03cac11b769e07bb3f2a450 (diff)
downloadrust-22b7e4dd565a7471aa4ff9f52e44df1c6c9ffdc8.tar.gz
rust-22b7e4dd565a7471aa4ff9f52e44df1c6c9ffdc8.zip
auto merge of #16534 : thestinger/rust/dep, r=huonw
This is already enabled by default for x86_64 executables on Windows,
but it needs to be manually enabled on x86.

Closes #16533
-rw-r--r--src/librustc/back/link.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index f3e130cf768..03a51ee8db5 100644
--- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs
@@ -1472,6 +1472,9 @@ fn link_args(cmd: &mut Command,
         // [1] - https://sourceware.org/bugzilla/show_bug.cgi?id=13130
         // [2] - https://code.google.com/p/go/issues/detail?id=2139
         cmd.arg("-Wl,--enable-long-section-names");
+
+        // Always enable DEP (NX bit) when it is available
+        cmd.arg("-Wl,--nxcompat");
     }
 
     if sess.targ_cfg.os == abi::OsAndroid {