Simplify code for HP machines.

* m/hp800.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, NO_REMAP): Do not define
for GNU_LINUX, not needed.
(UNEXEC, NEED_BSDTTY): Move definitions...
* s/hpux10-20.h (UNEXEC, NEED_BSDTTY): ... here.

3 files changed, 13 insertions, 30 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 37d76ab73e3..46ad20ac94d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2010-04-07  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        Simplify code for HP machines.
+        * m/hp800.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, NO_REMAP): Do not define
+        for GNU_LINUX, not needed.
+        (UNEXEC, NEED_BSDTTY): Move definitions...
+        * s/hpux10-20.h (UNEXEC, NEED_BSDTTY): ... here.
+
         * m/iris4d.h (UNEXEC): Move definition ...
         * s/irix6-5.h (UNEXEC): ... here.
 
diff --git a/src/m/hp800.h b/src/m/hp800.h
index bf684a871a9..d95da6643ab 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -41,9 +41,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EXPLICIT_SIGN_EXTEND
 
 
-/* Common definitions for HPUX and GNU/Linux.  */
+/* Stuff for just HPUX.  */
 
-#if defined (__hpux) || defined (GNU_LINUX)
+#if defined (__hpux)
 
 /* Define NO_REMAP if memory segmentation makes it not work well
    to change the boundary between the text section and data section
@@ -52,26 +52,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define NO_REMAP
 
-#endif /* __hpux or GNU_LINUX */
-
-/* Stuff for just GNU/Linux.  */
-
-#ifdef GNU_LINUX
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-#endif /* GNU_LINUX */
-
-/* Stuff for just HPUX.  */
-
-#ifdef __hpux
-
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
    pure and impure space as loaded can vary, and even their
    relative order cannot be relied on.
@@ -88,14 +68,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DATA_START    0x40000000
 #define TEXT_START    0x00000000
 
-/* This machine requires completely different unexec code
-   which lives in a separate file.  Specify the file name.  */
-
-#define UNEXEC unexhp9k800.o
-
-/* Include the file bsdtty.h, since this machine has job control.  */
-#define NEED_BSDTTY
-
 /* Data type of load average, as read out of kmem.  */
 
 #define LOAD_AVE_TYPE double
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index cf670cd51a0..e56b25ecaee 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -89,6 +89,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define HAVE_PERROR  /* Delete this line for version 6.  */
 
+#define UNEXEC unexhp9k800.o
+
+/* Include the file bsdtty.h, since this machine has job control.  */
+#define NEED_BSDTTY
+
 /* This is how to get the device name of the tty end of a pty.  */
 #define PTY_TTY_NAME_SPRINTF \
             sprintf (pty_name, "/dev/pty/tty%c%x", c, i);