Skip to content

Commit

Permalink
work around yet another MinGW-w64 ASLR bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@thestinger
thestinger committed Oct 5, 2014
1 parent f56c1c9 commit 6bb648f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/librustc/back/link.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1025,10 +1025,10 @@ fn link_args(cmd: &mut Command,
cmd.arg("-Wl,--nxcompat");

// Mark all dynamic libraries and executables as compatible with ASLR
// FIXME #17098: ASLR breaks gdb
if sess.opts.debuginfo == NoDebugInfo {
cmd.arg("-Wl,--dynamicbase");
}
// FIXME #16514: ASLR is disabled on Windows due to MinGW-w64 bugs:
// FIXME #17098: ASLR breaks gdb on Windows
// 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
// space available to x86 Windows binaries on x86_64.
Expand Down

5 comments on commit 6bb648f

@bors
Copy link
Contributor

@bors bors commented on 6bb648f Oct 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from eddyb
at https://github.com/thestinger/rust/commit/6bb648fadcc946f7cbce4644c0a7daa73fc0dab8

@bors
Copy link
Contributor

@bors bors commented on 6bb648f Oct 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/windows = 6bb648f into auto

@bors
Copy link
Contributor

@bors bors commented on 6bb648f Oct 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thestinger/rust/windows = 6bb648f merged ok, testing candidate = 6d15f28

@bors
Copy link
Contributor

@bors bors commented on 6bb648f Oct 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1677
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1674
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1668
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1674
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1671
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1670
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1670
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1674
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1668
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1667
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1670
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1327
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1324
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1328
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/161
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/160
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/159

@bors
Copy link
Contributor

@bors bors commented on 6bb648f Oct 6, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 6d15f28

Please sign in to comment.