2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e92e1dad809..e2428088cff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-01-26  Gerd Moellmann  <gerd@gnu.org>
 
+        * s/irix6-5.h [__GNUC__ && __GNUC_MINOR__ >= 95]: Undef
+        LD_SWITCH_SYSTEM inherited from irix5-0.h.
+
         * bytecode.c (Fbyte_code) [BYTE_CODE_SAFE]: Fix typo.
 
 2000-01-25  Gerd Moellmann  <gerd@gnu.org>
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 8222c91e4f4..e41347d4d73 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -2,6 +2,12 @@
 #define IRIX6_5
 #include "irix5-0.h"
 
+/* David Starks-Browning <starksb@ebi.ac.uk> reports this is necessary
+   for building Emacs on IRIX64 6.5 IP27 mips with GCC 2.95.2.  */
+#if __GNUC__ && __GNUC_MINOR__ >= 95
+#undef LD_SWITCH_SYSTEM
+#endif
+
 /* Irix 6 tries to do 64 bits, but doesn't do it fully,
    so inhibit that.  */
 #define IRIX_FORCE_32_BITS