diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/m/ibmrs6000.h | 12 | ||||
| -rw-r--r-- | src/m/ibmrs6000.inp | 4 | ||||
| -rw-r--r-- | src/s/aix4-2.h | 4 |
4 files changed, 11 insertions, 16 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c839260336d..5794311868d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2010-05-01 Dan Nicolaescu <dann@ics.uci.edu> + Clean up AIX code. + * m/ibmrs6000.inp: Remove file, unused. + * m/ibmrs6000.h (IBMR2AIX): Remove, unused. + (LD_SWITCH_MACHINE): Rename to LD_SWITCH_SYSTEM_TEMACS, and move + definition ... + * s/aix4-2.h (LD_SWITCH_SYSTEM_TEMACS): ... here. + * sysdep.c (child_setup_tty, init_sys_modes): Remove !IBMR2AIX code, unused. 2010-05-01 Eli Zaretskii <eliz@gnu.org> diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index a62cb5d1987..8027afcc30e 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -25,8 +25,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Now define a symbol for the cpu type, if your compiler does not define it automatically. */ -#define IBMR2AIX - /* The data segment in this machine always starts at address 0x20000000. An address of data cannot be stored correctly in a Lisp object; we always lose the high bits. We must tell XPNTR to add them back. */ @@ -36,16 +34,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define WORDS_BIG_ENDIAN #define DATA_SEG_BITS 0x20000000 -/* 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 - which most machines don't have. We use the name .inp instead of .imp - because .inp is a better convention to use in make-dist for naming - random input files. */ -#ifdef THIS_IS_MAKEFILE /* Don't use this in configure. */ -#define LD_SWITCH_MACHINE -Wl,-bnodelcsect -#endif /* THIS_IS_MAKEFILE */ - #ifndef NLIST_STRUCT /* AIX supposedly doesn't use this interface, but on the RS/6000 it apparently does. */ diff --git a/src/m/ibmrs6000.inp b/src/m/ibmrs6000.inp deleted file mode 100644 index d7f3fddaf6f..00000000000 --- a/src/m/ibmrs6000.inp +++ /dev/null @@ -1,4 +0,0 @@ -#! -pthread_yield - -# arch-tag: fc6d01ea-c488-4862-bbdb-e8d3e0f6fdb3 diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index b6ef00a1fdb..2c7f8c06157 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h @@ -100,6 +100,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define LIBS_SYSTEM -lrts -lIM -liconv #endif +#define LD_SWITCH_SYSTEM_TEMACS -Wl,-bnodelcsect + + + /* Use terminfo instead of termcap. */ #define TERMINFO |