Merge from origin/emacs-25

[gnu-emacs] / src / unexelf.c

diff --git a/src/unexelf.c b/src/unexelf.c
index 3dc0456d9b6bd290815f481a712cf83db42440fd..551915712fb95c40fa95eb8dee5da289afea39d0 100644 (file)
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -5,8 +5,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -211,10 +211,6 @@ entry_address (void *section_h, ptrdiff_t idx, ptrdiff_t entsize)
 
 typedef unsigned char byte;
 
-#ifdef HYBRID_MALLOC
-extern int bss_sbrk_did_unexec;
-#endif
-
 /* ****************************************************************
  * unexec
  *
@@ -231,10 +227,6 @@ unexec (const char *new_name, const char *old_name)
   off_t new_file_size;
   void *new_break;
 
-#ifdef HYBRID_MALLOC
-  bss_sbrk_did_unexec = 1;
-#endif
-
   /* Pointers to the base of the image of the two files.  */
   caddr_t old_base, new_base;
 
@@ -469,29 +461,6 @@ unexec (const char *new_name, const char *old_name)
          || !strcmp (old_section_names + new_shdr->sh_name, ".sdata")
          || !strcmp (old_section_names + new_shdr->sh_name, ".lit4")
          || !strcmp (old_section_names + new_shdr->sh_name, ".lit8")
-         /* The conditional bit below was in Oliva's original code
-            (1999-08-25) and seems to have been dropped by mistake
-            subsequently.  It prevents a crash at startup under X in
-            `IRIX64 6.5 6.5.17m', whether compiled on that release or
-            an earlier one.  It causes no trouble on the other ELF
-            platforms I could test (Irix 6.5.15m, Solaris 8, Debian
-            Potato x86, Debian Woody SPARC); however, it's reported
-            to cause crashes under some version of GNU/Linux.  It's
-            not yet clear what's changed in that Irix version to
-            cause the problem, or why the fix sometimes fails under
-            GNU/Linux.  There's probably no good reason to have
-            something Irix-specific here, but this will have to do
-            for now.  IRIX6_5 is the most specific macro we have to
-            test.  -- fx 2002-10-01
-
-            The issue _looks_ as though it's gone away on 6.5.18m,
-            but maybe it's still lurking, to be triggered by some
-            change in the binary.  It appears to concern the dynamic
-            loader, but I never got anywhere with an SGI support call
-            seeking clues.  -- fx 2002-11-29.  */
-#ifdef IRIX6_5
-         || !strcmp (old_section_names + new_shdr->sh_name, ".got")
-#endif
          || !strcmp (old_section_names + new_shdr->sh_name, ".sdata1")
          || !strcmp (old_section_names + new_shdr->sh_name, ".data1"))
        src = (caddr_t) old_shdr->sh_addr;
@@ -673,9 +642,6 @@ unexec (const char *new_name, const char *old_name)
              || !strcmp (old_section_names + shdr->sh_name, ".sdata")
              || !strcmp (old_section_names + shdr->sh_name, ".lit4")
              || !strcmp (old_section_names + shdr->sh_name, ".lit8")
-#ifdef IRIX6_5                 /* see above */
-             || !strcmp (old_section_names + shdr->sh_name, ".got")
-#endif
              || !strcmp (old_section_names + shdr->sh_name, ".sdata1")
              || !strcmp (old_section_names + shdr->sh_name, ".data1"))
            {