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

[Dave Love]

Index: emacs/src/unexelf.c
diff -c emacs/src/unexelf.c:1.50 emacs/src/unexelf.c:1.51
*** emacs/src/unexelf.c:1.50    Wed Sep 18 11:55:11 2002
--- emacs/src/unexelf.c Mon Oct  7 18:50:47 2002
***************
*** 1012,1017 ****
--- 1012,1034 ----
                      ".lit4")
          || !strcmp ((old_section_names + NEW_SECTION_H (n).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' with c_dev 7.3.1.3m.  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  */
+ #ifdef IRIX6_5
+         || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
+                     ".got")
+ #endif
          || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
                      ".sdata1")
          || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
***************
*** 1195,1200 ****
--- 1212,1221 ----
                          ".lit4")
              || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
                          ".lit8")
+ #ifdef IRIX6_5                        /* see above */
+             || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+                         ".got")
+ #endif
              || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
                          ".sdata1")
              || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),