* aout64.h (RELOC_EXT_BITS_EXTERN_BIG): Wrap definition in #ifndef.

	(RELOC_EXT_BITS_EXTERN_LITTLE): Ditto.
	(RELOC_EXT_BITS_TYPE_BIG): Ditto.
	(RELOC_EXT_BITS_TYPE_SH_BIG): Ditto.
	(RELOC_EXT_BITS_TYPE_LITTLE): Ditto.
	(RELOC_EXT_BITS_TYPE_SH_LITTLE): Ditto.

diff --git a/include/aout/ChangeLog b/include/aout/ChangeLog
index 63f17ec830da0a54763dc4e4c48b5bea550a23a2..1645a5ac706b16679c1b8726673d99006c414475 100644 (file)
--- a/include/aout/ChangeLog
+++ b/include/aout/ChangeLog
@@ -1,3 +1,12 @@
+Mon Apr  3 13:29:08 2000  Hans-Peter Nilsson  <hp@axis.com>
+
+       * aout64.h (RELOC_EXT_BITS_EXTERN_BIG): Wrap definition in #ifndef.
+       (RELOC_EXT_BITS_EXTERN_LITTLE): Ditto.
+       (RELOC_EXT_BITS_TYPE_BIG): Ditto.
+       (RELOC_EXT_BITS_TYPE_SH_BIG): Ditto.
+       (RELOC_EXT_BITS_TYPE_LITTLE): Ditto.
+       (RELOC_EXT_BITS_TYPE_SH_LITTLE): Ditto.
+
 1999-07-12  Ian Lance Taylor  <ian@zembu.com>
 
        * aout64.h (N_SHARED_LIB): Define as 0 if TEXT_START_ADDR is

diff --git a/include/aout/aout64.h b/include/aout/aout64.h
index bf743c48666aca8d60ac2839ac49d13817ea84df..bec844036466883db63aa4ed5132ea47bd90e5b5 100644 (file)
--- a/include/aout/aout64.h
+++ b/include/aout/aout64.h
@@ -388,13 +388,29 @@ struct reloc_ext_external {
   bfd_byte r_addend[BYTES_IN_WORD];    /* datum addend                         */
 };
 
+#ifndef RELOC_EXT_BITS_EXTERN_BIG
 #define        RELOC_EXT_BITS_EXTERN_BIG       ((unsigned int) 0x80)
+#endif
+
+#ifndef RELOC_EXT_BITS_EXTERN_LITTLE
 #define        RELOC_EXT_BITS_EXTERN_LITTLE    ((unsigned int) 0x01)
+#endif
 
+#ifndef RELOC_EXT_BITS_TYPE_BIG
 #define        RELOC_EXT_BITS_TYPE_BIG         ((unsigned int) 0x1F)
+#endif
+
+#ifndef RELOC_EXT_BITS_TYPE_SH_BIG
 #define        RELOC_EXT_BITS_TYPE_SH_BIG      0
+#endif
+
+#ifndef RELOC_EXT_BITS_TYPE_LITTLE
 #define        RELOC_EXT_BITS_TYPE_LITTLE      ((unsigned int) 0xF8)
+#endif
+
+#ifndef RELOC_EXT_BITS_TYPE_SH_LITTLE
 #define        RELOC_EXT_BITS_TYPE_SH_LITTLE   3
+#endif
 
 /* Bytes per relocation entry */
 #define        RELOC_EXT_SIZE  (BYTES_IN_WORD + 3 + 1 + BYTES_IN_WORD)