Renumber cpu flag bits to avoid collision with PE flag bits

diff --git a/include/coff/ChangeLog b/include/coff/ChangeLog
index 783a017e474bbf58d652aaf979ada94c6199b91c..b6c35ab313ef38311cbd5ddf9f86c805ff6762fa 100644 (file)
--- a/include/coff/ChangeLog
+++ b/include/coff/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 17 13:35:35 1999  Stan Cox  <scox@cygnus.com>
+
+       * coff/arm.h (F_PIC, F_ARM_2, F_ARM_2a, F_ARM_3, F_ARM_3M,
+       F_ARM_4, F_ARM_4T, F_APCS26): Changed values to distinguish
+       F_ARM_2a, F_ARM_3M, F_ARM_4T.
+
 1999-05-15  Nick Clifton  <nickc@cygnus.com>
 
        * mcore.h (IMAGE_REL_MCORE_RVA): Define.

diff --git a/include/coff/arm.h b/include/coff/arm.h
index dd578b1a76a0eb6b3c434a5fc2f845fc9dd68edf..e5d78d69367d28658771782c21f267670b3c9f3a 100644 (file)
--- a/include/coff/arm.h
+++ b/include/coff/arm.h
@@ -44,16 +44,17 @@ struct external_filehdr {
 /* Bits stored in flags field of the internal_f structure */
 
 #define F_INTERWORK    (0x0010)
-#define F_PIC_INT      (0x0020)
 #define F_APCS_FLOAT   (0x0040)
-#define F_ARM_ARCHITECTURE_MASK        (0x0c00)
-#define F_ARM_2                (0x0000)
-#define F_ARM_2a       (0x0000)
-#define F_ARM_3                (0x0400)
-#define F_ARM_3M       (0x0400)
-#define F_ARM_4                (0x0800)
-#define F_ARM_4T       (0x0c00)
-#define F_APCS26       (0x4000)
+#define F_PIC          (0x0080)
+#define F_APCS26       (0x1000)
+#define F_ARM_ARCHITECTURE_MASK (0x4000+0x0800+0x0400)
+#define F_ARM_2                (0x0400)
+#define F_ARM_2a       (0x0800)
+#define F_ARM_3                (0x0c00)
+#define F_ARM_3M       (0x4000)
+#define F_ARM_4                (0x4400)
+#define F_ARM_4T       (0x4800)
+#define F_ARM_spare    (0x4c00)
 
 /*
  * ARMMAGIC ought to encoded the procesor type,