diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-02-14 12:05:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-02-14 12:05:10 -0800 |
| commit | 35b3a27e67b60e547ac8bc9388e7724d1f829959 (patch) | |
| tree | 42aabed9384e977d28c33039d7ec6bfffe28e371 /configure.ac | |
| parent | 9e16c3b44bcf407678563f0bd679c0887ec3011c (diff) | |
| download | emacs-35b3a27e67b60e547ac8bc9388e7724d1f829959.tar.gz | |
Fix AIX port.
* configure.ac (DATA_START, DATA_SEG_BITS): Set to 0x20000000 on AIX.
(GC_MARK_STACK): Do not set to GC_USE_GCPROS_AS_BEFORE, as that
runs afoul of some other bug in Emacs, and the default value
GC_MAKE_GCPROS_NOOPS has been tested and works.
* src/lisp.h (XPNTR) [!USE_LSB_TAG && DATA_SEG_BITS]:
Fix bug introduced in 2012-07-27 change. DATA_SEG_BITS, if set,
was #undeffed earlier, so it cannot be used as a macro here.
Use the constant and not the macro. Tested on AIX.
* src/unexaix.c: Revert 2013-02-11 and 2013-02-12 changes to this
file. They're almost surely OK but we're just before a release so
we should avoid changes unless they're clearly needed. Instead,
make the following minor change:
(ADDR_CORRECT): New macro.
Fixes: debbugs:13650
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c163ecee3fe..7f6defa7059 100644 --- a/configure.ac +++ b/configure.ac @@ -3764,6 +3764,11 @@ case $opsys in AC_DEFINE(DATA_START, [({ extern int data_start; (char *) &data_start; })]) ;; + aix*) + dnl This works with 32-bit executables; Emacs doesn't support 64-bit. + AC_DEFINE(DATA_START, [0x20000000]) + AC_DEFINE(DATA_SEG_BITS, [0x20000000]) + ;; hpux*) dnl The data segment on this machine always starts at address 0x40000000. AC_DEFINE(DATA_START, [0x40000000]) @@ -3827,7 +3832,7 @@ AH_TEMPLATE(GC_MARK_STACK, [Define to GC_USE_GCPROS_AS_BEFORE if case $opsys in - aix4-2 | hpux* | unixware) + hpux* | unixware) dnl Conservative garbage collection has not been tested, so for now dnl play it safe and stick with the old-fashioned way of marking. AC_DEFINE(GC_MARK_STACK, [GC_USE_GCPROS_AS_BEFORE]) |