auto merge of #17809 : thestinger/rust/windows, r=eddyb

This commit is contained in:
bors 2014-10-06 00:27:16 +00:00
commit 6d15f28986

View File

@ -1025,10 +1025,10 @@ fn link_args(cmd: &mut Command,
cmd.arg("-Wl,--nxcompat"); cmd.arg("-Wl,--nxcompat");
// Mark all dynamic libraries and executables as compatible with ASLR // Mark all dynamic libraries and executables as compatible with ASLR
// FIXME #17098: ASLR breaks gdb // FIXME #16514: ASLR is disabled on Windows due to MinGW-w64 bugs:
if sess.opts.debuginfo == NoDebugInfo { // FIXME #17098: ASLR breaks gdb on Windows
cmd.arg("-Wl,--dynamicbase"); // FIXME #17684: ASLR breaks thread-local storage on Windows
} //cmd.arg("-Wl,--dynamicbase");
// Mark all dynamic libraries and executables as compatible with the larger 4GiB address // Mark all dynamic libraries and executables as compatible with the larger 4GiB address
// space available to x86 Windows binaries on x86_64. // space available to x86 Windows binaries on x86_64.