From 360a29d9c93086fe34222c42b59f46ab6e0fb14c Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Thu, 18 Sep 2014 00:50:34 -0400
Subject: [PATCH] stop disabling ASLR in normal Windows builds

Closes #16514
---
 src/librustc/back/link.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index de1eef1dce3..91c61650cf6 100644
--- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs
@@ -1024,7 +1024,9 @@ fn link_args(cmd: &mut Command,
 
         // Mark all dynamic libraries and executables as compatible with ASLR
         // FIXME #17098: ASLR breaks gdb
-        // cmd.arg("-Wl,--dynamicbase");
+        if sess.opts.debuginfo == NoDebugInfo {
+            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.