# HG changeset patch # User Richard M. Stallman # Date 826309657 0 # Node ID d3a70cd8d181a750c500245b6850075c2f473261 # Parent 66a9ba81f2c4c67de4a89fb037d6365d953dca33 (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 -r 66a9ba81f2c4 -r d3a70cd8d181 src/m/ibmrs6000.h --- a/src/m/ibmrs6000.h Fri Mar 08 18:15:46 1996 +0000 +++ b/src/m/ibmrs6000.h Fri Mar 08 18:27:37 1996 +0000 @@ -159,7 +159,6 @@ #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 @@ #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. */