[Emacs-diffs] emacs-26 65889a6: Fix bootstrap infloop in GNU/Linux alpha

[Paul Eggert]

branch: emacs-26
commit 65889a6d127fcbbbdc1e74d26036e91bd24d1405
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Fix bootstrap infloop in GNU/Linux alpha
    
    * src/emacs.c (main): Do not re-exec if EMACS_HEAP_EXEC
    is already set (Bug#32083).
---
 src/emacs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/emacs.c b/src/emacs.c
index 017c623..f5e4742 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.