diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-03-08 18:27:37 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-03-08 18:27:37 +0000 |
| commit | 34be17c7136611a6816cecac0d92de5378d89a94 (patch) | |
| tree | 29e6cdaf632715d30991e4518040ff34908179a2 /src/m | |
| parent | 92177123dc797c58b1456de4afb761b572b2efc7 (diff) | |
| download | emacs-34be17c7136611a6816cecac0d92de5378d89a94.tar.gz | |
(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,
Diffstat (limited to 'src/m')
| -rw-r--r-- | src/m/ibmrs6000.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index bcd803e1c11..13ea5324955 100644 --- 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. */ |