(LD_SWITCH_MACHINE): Undo previous change--

define this unconditionally.
(LD_SWITCH_SITE): New conditional definition.
For gcc 2.7.x, use /bin/ld instead of collect2,

diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index bcd803e1c116c899d0061cbc8108e24ad9ebcc97..13ea5324955de9a9577dd9cf8e04a68c01d2bf22 100644 (file)
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -159,7 +159,6 @@ Boston, MA 02111-1307, USA.  */
 #define ORDINARY_LINK
 
 #ifndef USG5_4
-#ifndef __GNUC__
 /* sfreed@unm.edu says add -bI:/usr/lpp/X11/bin/smt.exp for AIX 3.2.4.  */
 /* marc@sti.com (Marc Pawliger) says ibmrs6000.inp is needed to avoid
    linker error for updated X11R5 libraries, which references pthread library
@@ -175,7 +174,11 @@ Boston, MA 02111-1307, USA.  */
 #define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp
 #endif
 #endif /* not AIX4 */
-#endif /* not __GNUC__ */
+
+/* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead.  */
+#if __GNUC__ == 2 && __GNUC_MINOR__ == 7
+#define LD_SWITCH_SITE -B/bin/
+#endif
 
 /* AIX supposedly doesn't use this interface, but on the RS/6000
    it apparently does.  */