[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100109: Clean up AIX code.
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100109: Clean up AIX code. |
Date: |
Sat, 01 May 2010 13:19:41 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100109
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sat 2010-05-01 13:19:41 -0700
message:
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.
removed:
src/m/ibmrs6000.inp
modified:
src/ChangeLog
src/m/ibmrs6000.h
src/s/aix4-2.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-05-01 20:14:10 +0000
+++ b/src/ChangeLog 2010-05-01 20:19:41 +0000
@@ -1,5 +1,12 @@
2010-05-01 Dan Nicolaescu <address@hidden>
+ 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 <address@hidden>
=== modified file 'src/m/ibmrs6000.h'
--- a/src/m/ibmrs6000.h 2010-04-25 22:16:58 +0000
+++ b/src/m/ibmrs6000.h 2010-05-01 20:19:41 +0000
@@ -25,8 +25,6 @@
/* 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 @@
#define WORDS_BIG_ENDIAN
#define DATA_SEG_BITS 0x20000000
-/* address@hidden says add -bI:/usr/lpp/X11/bin/smt.exp for AIX 3.2.4. */
-/* address@hidden (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. */
=== removed file 'src/m/ibmrs6000.inp'
--- a/src/m/ibmrs6000.inp 2010-01-04 05:35:18 +0000
+++ b/src/m/ibmrs6000.inp 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!
-pthread_yield
-
-# arch-tag: fc6d01ea-c488-4862-bbdb-e8d3e0f6fdb3
=== modified file 'src/s/aix4-2.h'
--- a/src/s/aix4-2.h 2010-04-28 07:01:43 +0000
+++ b/src/s/aix4-2.h 2010-05-01 20:19:41 +0000
@@ -100,6 +100,10 @@
#define LIBS_SYSTEM -lrts -lIM -liconv
#endif
+#define LD_SWITCH_SYSTEM_TEMACS -Wl,-bnodelcsect
+
+
+
/* Use terminfo instead of termcap. */
#define TERMINFO