emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 61828e5: Fix MS-Windows link switches for unexec


From: Eli Zaretskii
Subject: master 61828e5: Fix MS-Windows link switches for unexec
Date: Thu, 22 Apr 2021 13:24:10 -0400 (EDT)

branch: master
commit 61828e55a823640870637c471bc7d62ed1e001a6
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix MS-Windows link switches for unexec
    
    * configure.ac (LD_SWITCH_SYSTEM_TEMACS) [mingw32]: Disable ASLR
    when linking for unexec.  Reported by Nikolay Kudryavtsev
    <nikolay.kudryavtsev@gmail.com>.
---
 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure.ac b/configure.ac
index d3647bd..7179fbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5560,6 +5560,10 @@ case "$opsys" in
      x86_64-*-*) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 
-Wl,-heap,0x00100000 -Wl,-image-base,0x400000000 -Wl,-entry,__start 
-Wl,-Map,./temacs.map" ;;
      *) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 
-Wl,-image-base,0x01000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;;
    esac
+   ## If they want unexec, disable Windows ASLR for the Emacs binary
+   if test "$with_dumping" = "unexec"; then
+     LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS 
-Wl,-disable-dynamicbase -Wl,-disable-high-entropy-va 
-Wl,-default-image-base-low"
+   fi
    ;;
 
   *) LD_SWITCH_SYSTEM_TEMACS= ;;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]