auto merge of #16534 : thestinger/rust/dep, r=huonw

bors · bors · commit 22b7e4dd565a · 2014-08-16T14:51:07.000Z
This is already enabled by default for x86_64 executables on Windows, but it needs to be manually enabled on x86. Closes #16533
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -1472,6 +1472,9 @@ fn link_args(cmd: &mut Command,`
`1472`	`1472`	`// [1] - https://sourceware.org/bugzilla/show_bug.cgi?id=13130`
`1473`	`1473`	`// [2] - https://code.google.com/p/go/issues/detail?id=2139`
`1474`	`1474`	`cmd.arg("-Wl,--enable-long-section-names");`
	`1475`	`+`
	`1476`	`+ // Always enable DEP (NX bit) when it is available`
	`1477`	`+ cmd.arg("-Wl,--nxcompat");`
`1475`	`1478`	`}`
`1476`	`1479`
`1477`	`1480`	`if sess.targ_cfg.os == abi::OsAndroid {`