diff options
| author | Peter O'Gorman <bug-gnu-emacs@mlists.thewrittenword.com> | 2011-01-23 17:00:22 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-23 17:00:22 -0500 |
| commit | 269f055e37f51b548b9261c1cad74f895976b440 (patch) | |
| tree | c04dec630d4b33b27fe58d3cb153f4e3fc0ce1bd | |
| parent | 0c19da8bb0362b98ea22f1c13104825bdcb121d2 (diff) | |
| download | emacs-269f055e37f51b548b9261c1cad74f895976b440.tar.gz | |
Two more hunks from the HP-UX patch at Bug#6811.
* configure.in: Add HP-UX on IA64 (Bug#6811).
* src/s/hpux11.h: Set CANNOT_DUMP on IA64 (Bug#6811).
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/s/hpux11.h | 6 |
5 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index a4e2660bb26..71ac292bbde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-01-23 Peter O'Gorman <bug-gnu-emacs@mlists.thewrittenword.com> (tiny change) + + * configure.in: Add HP-UX on IA64 (Bug#6811). + 2011-01-12 Chong Yidong <cyd@stupidchicken.com> * configure.in [netbsd systems]: Check for tputs definition diff --git a/configure b/configure index c26ba818f26..66c9737a43a 100755 --- a/configure +++ b/configure @@ -3182,6 +3182,10 @@ $as_echo "#define HAVE_CRTIN /**/" >>confdefs.h CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS" ;; + ia64*-hp-hpux1[1-9]* ) + machine=hp800 opsys=hpux11 + ;; + hppa*-*-linux-gnu* ) machine=hp800 opsys=gnu-linux ;; diff --git a/configure.in b/configure.in index b75f965cfa7..fd1c62ccb7d 100644 --- a/configure.in +++ b/configure.in @@ -493,6 +493,10 @@ dnl see the `changequote' comment above. CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS" ;; + ia64*-hp-hpux1[1-9]* ) + machine=hp800 opsys=hpux11 + ;; + hppa*-*-linux-gnu* ) machine=hp800 opsys=gnu-linux ;; diff --git a/src/ChangeLog b/src/ChangeLog index 3e37410a485..86fb6abb23c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,6 @@ +2011-01-23 Peter O'Gorman <bug-gnu-emacs@mlists.thewrittenword.com> (tiny change) + * s/hpux11.h: Set CANNOT_DUMP on IA64 (Bug#6811). + 2011-01-22 Martin Rudalics <rudalics@gmx.at> * window.c (select_window): New function. diff --git a/src/s/hpux11.h b/src/s/hpux11.h index 3382395a90f..f9ce5fabe2d 100644 --- a/src/s/hpux11.h +++ b/src/s/hpux11.h @@ -12,5 +12,11 @@ then close and reopen it in the child. */ #define USG_SUBTTY_WORKS +/* FIXME. Peter O'Gorman reports that dumping using unexelf.o doesn't + work either: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6811 */ +#if __ia64 +#define CANNOT_DUMP 1 +#endif + /* arch-tag: f5a3d780-82cd-4a9a-832e-a4031aab788b (do not change this comment) */ |