Make it so it compiles if QMAGIC is not defined (e.g. hp300hpux).

	* aout64.h (N_BADMAG): Recognize QMAGIC.
	N_TXTOFF, N_TXTADDR, N_TXTSIZE: Special code for QMAGIC.
	N_DATOFF: Pad text size if we need to.

diff --git a/include/aout/aout64.h b/include/aout/aout64.h
index 04c28cc56dc890ca82b1f6ddcee93b5daa2c7471..1e6ef0ebd03d6e29e55961cde703fd2db83f83bc 100644 (file)
--- a/include/aout/aout64.h
+++ b/include/aout/aout64.h
@@ -48,6 +48,12 @@ struct external_exec
 
 #endif
 
+#ifdef QMAGIC
+#define N_IS_QMAGIC(x) (N_MAGIC (x) == QMAGIC)
+#else
+#define N_IS_QMAGIC(x) (0)
+#endif
+
 /* The difference between PAGE_SIZE and N_SEGSIZE is that PAGE_SIZE is
    the the finest granularity at which you can page something, thus it
    controls the padding (if any) before the text segment of a ZMAGIC
@@ -114,9 +120,9 @@ struct external_exec
 
 #ifndef N_TXTADDR
 #define N_TXTADDR(x) \
-    (/* The address of a QMAGIC file is always one page in */ \
+    (/* The address of a QMAGIC file is always one page in, */ \
      /* with the header in the text.  */ \
-     N_MAGIC(x) == QMAGIC ? PAGE_SIZE + EXEC_BYTES_SIZE : \
+     N_IS_QMAGIC (x) ? PAGE_SIZE + EXEC_BYTES_SIZE : \
      N_MAGIC(x) != ZMAGIC ? 0 :        /* object file or NMAGIC */\
      N_SHARED_LIB(x) ? 0 :     \
      N_HEADER_IN_TEXT(x)  ?    \
@@ -144,7 +150,7 @@ struct external_exec
 #ifndef N_TXTSIZE
 #define        N_TXTSIZE(x) \
     (/* For QMAGIC, we don't consider the header part of the text section.  */\
-     N_MAGIC(x) == QMAGIC ? (x).a_text - EXEC_BYTES_SIZE : \
+     N_IS_QMAGIC (x) ? (x).a_text - EXEC_BYTES_SIZE : \
      (N_MAGIC(x) != ZMAGIC || N_SHARED_LIB(x)) ? (x).a_text : \
      N_HEADER_IN_TEXT(x)  ?    \
            (x).a_text - EXEC_BYTES_SIZE:       /* no padding */\