[Emacs-diffs] Changes to emacs/src/emacs.c,v

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        08/10/21 06:32:28

Index: emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -b -r1.448 -r1.449
--- emacs.c     6 Oct 2008 16:16:56 -0000       1.448
+++ emacs.c     21 Oct 2008 06:32:28 -0000      1.449
@@ -212,8 +212,8 @@
 /* The gap between BSS end and heap start as far as we can tell.  */
 static unsigned long heap_bss_diff;
 
-/* If the gap between BSS end and heap start is larger than this we try to
-   work around it, and if that fails, output a warning in dump-emacs.  */
+/* If the gap between BSS end and heap start is larger than this
+   output a warning in dump-emacs.  */
 #define MAX_HEAP_BSS_DIFF (1024*1024)
 
 
@@ -861,14 +861,10 @@
     }
 
 #ifdef HAVE_PERSONALITY_LINUX32
-  /* See if there is a gap between the end of BSS and the heap.
-     In that case, set personality and exec ourself again.  */
   if (!initialized
       && (strcmp (argv[argc-1], "dump") == 0
           || strcmp (argv[argc-1], "bootstrap") == 0)
-      && heap_bss_diff > MAX_HEAP_BSS_DIFF)
-    {
-      if (! getenv ("EMACS_HEAP_EXEC"))
+      && ! getenv ("EMACS_HEAP_EXEC"))
         {
           /* Set this so we only do this once.  */
           putenv("EMACS_HEAP_EXEC=true");
@@ -884,7 +880,6 @@
           /* If the exec fails, try to dump anyway.  */
           perror ("execvp");
         }
-    }
 #endif /* HAVE_PERSONALITY_LINUX32 */