From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 22 Apr 2021 19:11:08 +0000 (+0300)
Subject: ; * configure.ac (LD_SWITCH_SYSTEM_TEMACS) [mingw32]: Fix last change.
X-Git-Tag: emacs-28.0.90~2771
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9904aaebf7cf04fe8544417158250575a4be9d18;p=emacs.git

; * configure.ac (LD_SWITCH_SYSTEM_TEMACS) [mingw32]: Fix last change.
---

diff --git a/configure.ac b/configure.ac
index 7179fbe415f..a1629d73ab9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5562,7 +5562,10 @@ case "$opsys" in
    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"
+      case "$canonical" in
+        x86_64-*-*) LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS -Wl,-disable-dynamicbase -Wl,-disable-high-entropy-va -Wl,-default-image-base-low" ;;
+        *) LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS -Wl,-disable-dynamicbase" ;;
+      esac
    fi
    ;;