[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100407: Two more hunks from the HP-UX patch at Bug#6811.

[Chong Yidong]

------------------------------------------------------------
revno: 100407
author: Peter O'Gorman <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2011-01-23 17:00:22 -0500
message:
  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).
modified:
  ChangeLog
  configure
  configure.in
  src/ChangeLog
  src/s/hpux11.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-01-12 02:29:23 +0000
+++ b/ChangeLog 2011-01-23 22:00:22 +0000
@@ -1,3 +1,7 @@
+2011-01-23  Peter O'Gorman  <address@hidden>  (tiny change)
+
+       * configure.in: Add HP-UX on IA64 (Bug#6811).
+
 2011-01-12  Chong Yidong  <address@hidden>
 
        * configure.in [netbsd systems]: Check for tputs definition

=== modified file 'configure'
--- a/configure 2011-01-15 03:50:47 +0000
+++ b/configure 2011-01-23 22:00:22 +0000
@@ -3182,6 +3182,10 @@
     CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
   ;;
 
+  ia64*-hp-hpux1[1-9]* )
+    machine=hp800 opsys=hpux11
+  ;;
+
   hppa*-*-linux-gnu* )
     machine=hp800 opsys=gnu-linux
   ;;

=== modified file 'configure.in'
--- a/configure.in      2011-01-15 03:50:47 +0000
+++ b/configure.in      2011-01-23 22:00:22 +0000
@@ -493,6 +493,10 @@
     CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
   ;;
 
+  ia64*-hp-hpux1[1-9]* )
+    machine=hp800 opsys=hpux11
+  ;;
+
   hppa*-*-linux-gnu* )
     machine=hp800 opsys=gnu-linux
   ;;

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-22 02:44:53 +0000
+++ b/src/ChangeLog     2011-01-23 22:00:22 +0000
@@ -1,3 +1,6 @@
+2011-01-23  Peter O'Gorman  <address@hidden>  (tiny change)
+       * s/hpux11.h: Set CANNOT_DUMP on IA64 (Bug#6811).
+
 2011-01-22  Martin Rudalics  <address@hidden>
 
        * window.c (select_window): New function.

=== modified file 'src/s/hpux11.h'
--- a/src/s/hpux11.h    2010-01-04 05:35:18 +0000
+++ b/src/s/hpux11.h    2011-01-23 22:00:22 +0000
@@ -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) */