diff options
| author | Eli Zaretskii <[email protected]> | 2010-03-20 07:14:01 -0400 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2010-03-20 07:14:01 -0400 |
| commit | f2cdb04ac04fb8f9f92bce11df6e4a020720208b (patch) | |
| tree | 4d231ff66e4145ce8967ed0c4ab71b364d05675f /src/m | |
| parent | 8eef7665fa98baae93da5151c27ca0db4d1d6f5b (diff) | |
| parent | 22e8757456ea6608246d9c81a83f6c5119f2e1fb (diff) | |
Merge from mainline.
Diffstat (limited to 'src/m')
| -rw-r--r-- | src/m/alpha.h | 5 | ||||
| -rw-r--r-- | src/m/ibmrs6000.h | 15 |
2 files changed, 0 insertions, 20 deletions
diff --git a/src/m/alpha.h b/src/m/alpha.h index 5abf8bba72..065a0dd7d7 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -116,11 +116,6 @@ NOTE-END #endif /* __ELF__ */ -#if defined (GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6 -/* This controls a conditional in main. */ -#define LINUX_SBRK_BUG -#endif - /* On the Alpha it's best to avoid including TERMIO since struct termio and struct termios are mutually incompatible. */ #define NO_TERMIO diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 757db149ed..4304ea90cd 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -32,19 +32,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define IBMR2AIX -#ifndef UNEXEC -#define UNEXEC unexaix.o -#endif - -/* Define addresses, macros, change some setup for dump */ - -#define NO_REMAP - /* 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. */ -#ifndef USG5_4 #define TEXT_START 0x10000000 #define DATA_START 0x20000000 #define WORDS_BIG_ENDIAN @@ -75,12 +66,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define LIBS_MACHINE -lrts -lIM -liconv #endif -#else /* USG5_4 */ -#undef WORDS_BIG_ENDIAN -#define DATA_SEG_BITS 0 -#define LIBS_MACHINE -#endif /* USG5_4 */ - #undef ADDR_CORRECT #define ADDR_CORRECT(x) ((int)(x)) |