From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 8 Jul 2018 16:04:02 +0000 (-0700)
Subject: Fix bootstrap infloop in GNU/Linux alpha
X-Git-Tag: emacs-26.1.90~283
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65889a6d127fcbbbdc1e74d26036e91bd24d1405;p=emacs.git

Fix bootstrap infloop in GNU/Linux alpha

* src/emacs.c (main): Do not re-exec if EMACS_HEAP_EXEC
is already set (Bug#32083).
---

diff --git a/src/emacs.c b/src/emacs.c
index 017c62308c1..f5e47428ef9 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -707,10 +707,12 @@ main (int argc, char **argv)
   bool disable_aslr = dumping;
 # endif
 
-  if (disable_aslr && disable_address_randomization ())
+  if (disable_aslr && disable_address_randomization ()
+      && !getenv ("EMACS_HEAP_EXEC"))
     {
       /* Set this so the personality will be reverted before execs
-	 after this one.  */
+	 after this one, and to work around an re-exec loop on buggy
+	 kernels (Bug#32083).  */
       xputenv ("EMACS_HEAP_EXEC=true");
 
       /* Address randomization was enabled, but is now disabled.