diff options
| author | Richard M. Stallman | 1996-03-08 18:27:37 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-03-08 18:27:37 +0000 |
| commit | 24a31d57800836cbe38ebd1fe7925e7e49d52aae (patch) | |
| tree | 531035c480d4a6d0d701d982890a66b12cc94696 /src/m | |
| parent | a6d02d80ca445dacfb9ba443ab3c87e071dd7f5e (diff) | |
| download | emacs-24a31d57800836cbe38ebd1fe7925e7e49d52aae.tar.gz emacs-24a31d57800836cbe38ebd1fe7925e7e49d52aae.zip | |
(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. */ | |||
| 159 | #define ORDINARY_LINK | 159 | #define ORDINARY_LINK |
| 160 | 160 | ||
| 161 | #ifndef USG5_4 | 161 | #ifndef USG5_4 |
| 162 | #ifndef __GNUC__ | ||
| 163 | /* sfreed@unm.edu says add -bI:/usr/lpp/X11/bin/smt.exp for AIX 3.2.4. */ | 162 | /* sfreed@unm.edu says add -bI:/usr/lpp/X11/bin/smt.exp for AIX 3.2.4. */ |
| 164 | /* marc@sti.com (Marc Pawliger) says ibmrs6000.inp is needed to avoid | 163 | /* marc@sti.com (Marc Pawliger) says ibmrs6000.inp is needed to avoid |
| 165 | linker error for updated X11R5 libraries, which references pthread library | 164 | linker error for updated X11R5 libraries, which references pthread library |
| @@ -175,7 +174,11 @@ Boston, MA 02111-1307, USA. */ | |||
| 175 | #define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp | 174 | #define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp |
| 176 | #endif | 175 | #endif |
| 177 | #endif /* not AIX4 */ | 176 | #endif /* not AIX4 */ |
| 178 | #endif /* not __GNUC__ */ | 177 | |
| 178 | /* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead. */ | ||
| 179 | #if __GNUC__ == 2 && __GNUC_MINOR__ == 7 | ||
| 180 | #define LD_SWITCH_SITE -B/bin/ | ||
| 181 | #endif | ||
| 179 | 182 | ||
| 180 | /* AIX supposedly doesn't use this interface, but on the RS/6000 | 183 | /* AIX supposedly doesn't use this interface, but on the RS/6000 |
| 181 | it apparently does. */ | 184 | it apparently does. */ |