summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/w32api/ChangeLog33
-rw-r--r--winsup/w32api/include/winnt.h73
2 files changed, 91 insertions, 15 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 0b7378b51..a086f4a9a 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,34 @@
+2006-07-29 Danny Smith <dannysmith@users.sourceforge.net>
+
+ Update some more IMAGE relocation type indicators
+ to PECOFF v8 (May, 2006) specs.
+
+ * include/winnt.h (IMAGE_REL_SH3_ABSOLUTE,
+ IMAGE_REL_SH3_DIRECT16, IMAGE_REL_SH3_DIRECT32,
+ IMAGE_REL_SH3_DIRECT8, IMAGE_REL_SH3_DIRECT8_WORD,
+ IMAGE_REL_SH3_DIRECT8_LONG, IMAGE_REL_SH3_DIRECT4,
+ IMAGE_REL_SH3_DIRECT4_WORD, IMAGE_REL_SH3_DIRECT4_LONG,
+ IMAGE_REL_SH3_PCREL8_WORD, IMAGE_REL_SH3_PCREL8_LONG,
+ IMAGE_REL_SH3_PCREL12_WORD, IMAGE_REL_SH3_STARTOF_SECTION,
+ IMAGE_REL_SH3_SIZEOF_SECTION, IMAGE_REL_SH3_SECTION,
+ IMAGE_REL_SH3_SECREL, IMAGE_REL_SH3_DIRECT32_NB,
+ IMAGE_REL_SH3_GPREL4_LONG, IMAGE_REL_SH3_TOKEN,
+ IMAGE_REL_SHM_PCRELPT, IMAGE_REL_SHM_REFLO,
+ IMAGE_REL_SHM_REFHALF, IMAGE_REL_SHM_RELLO,
+ IMAGE_REL_SHM_RELHALF, IMAGE_REL_SHM_PAIR,
+ IMAGE_REL_SHM_NOMODE): Add defines.
+
+ (IMAGE_REL_M32R_ABSOLUTE, IMAGE_REL_M32R_ADDR32,
+ IMAGE_REL_M32R_ADDR32NB, IMAGE_REL_M32R_ADDR24,
+ IMAGE_REL_M32R_GPREL16, IMAGE_REL_M32R_PCREL24,
+ IMAGE_REL_M32R_PCREL16, IMAGE_REL_M32R_PCREL8,
+ IMAGE_REL_M32R_REFHALF, IMAGE_REL_M32R_REFHI,
+ IMAGE_REL_M32R_REFLO, IMAGE_REL_M32R_PAIR,
+ IMAGE_REL_M32R_SECTION, IMAGE_REL_M32R_SECREL,
+ IMAGE_REL_M32R_TOKEN): Add defines.
+
+ (IMAGE_REL_MIPS_JMPADDR16): Add define.
+
2006-07-27 Danny Smith <dannysmith@users.sourceforge.net>
Update some IMAGE flags to PECOFF v8 (May, 2006) specs.
@@ -16,7 +47,7 @@
IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER, IMAGE_SUBSYSTEM_EFI_ROM):
Add defines.
- (IMAGE_SYM_CLASS_CLR_TOKEN): Add define
+ (IMAGE_SYM_CLASS_CLR_TOKEN): Add define.
(IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY,
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index d365adabb..2f53a7733 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -1302,20 +1302,65 @@ typedef DWORD FLONG;
#define IMAGE_REL_IA64_GPREL32 0x001c
#define IMAGE_REL_IA64_ADDEND 0x001F
-#define IMAGE_REL_MIPS_ABSOLUTE 0
-#define IMAGE_REL_MIPS_REFHALF 1
-#define IMAGE_REL_MIPS_REFWORD 2
-#define IMAGE_REL_MIPS_JMPADDR 3
-#define IMAGE_REL_MIPS_REFHI 4
-#define IMAGE_REL_MIPS_REFLO 5
-#define IMAGE_REL_MIPS_GPREL 6
-#define IMAGE_REL_MIPS_LITERAL 7
-#define IMAGE_REL_MIPS_SECTION 10
-#define IMAGE_REL_MIPS_SECREL 11
-#define IMAGE_REL_MIPS_SECRELLO 12
-#define IMAGE_REL_MIPS_SECRELHI 13
-#define IMAGE_REL_MIPS_REFWORDNB 34
-#define IMAGE_REL_MIPS_PAIR 35
+#define IMAGE_REL_SH3_ABSOLUTE 0x0000
+#define IMAGE_REL_SH3_DIRECT16 0x0001
+#define IMAGE_REL_SH3_DIRECT32 0x0002
+#define IMAGE_REL_SH3_DIRECT8 0x0003
+#define IMAGE_REL_SH3_DIRECT8_WORD 0x0004
+#define IMAGE_REL_SH3_DIRECT8_LONG 0x0005
+#define IMAGE_REL_SH3_DIRECT4 0x0006
+#define IMAGE_REL_SH3_DIRECT4_WORD 0x0007
+#define IMAGE_REL_SH3_DIRECT4_LONG 0x0008
+#define IMAGE_REL_SH3_PCREL8_WORD 0x0009
+#define IMAGE_REL_SH3_PCREL8_LONG 0x000A
+#define IMAGE_REL_SH3_PCREL12_WORD 0x000B
+#define IMAGE_REL_SH3_STARTOF_SECTION 0x000C
+#define IMAGE_REL_SH3_SIZEOF_SECTION 0x000D
+#define IMAGE_REL_SH3_SECTION 0x000E
+#define IMAGE_REL_SH3_SECREL 0x000F
+#define IMAGE_REL_SH3_DIRECT32_NB 0x0010
+#define IMAGE_REL_SH3_GPREL4_LONG 0x0011
+#define IMAGE_REL_SH3_TOKEN 0x0012
+#define IMAGE_REL_SHM_PCRELPT 0x0013
+#define IMAGE_REL_SHM_REFLO 0x0014
+#define IMAGE_REL_SHM_REFHALF 0x0015
+#define IMAGE_REL_SHM_RELLO 0x0016
+#define IMAGE_REL_SHM_RELHALF 0x0017
+#define IMAGE_REL_SHM_PAIR 0x0018
+#define IMAGE_REL_SHM_NOMODE 0x8000
+
+#define IMAGE_REL_M32R_ABSOLUTE 0x0000
+#define IMAGE_REL_M32R_ADDR32 0x0001
+#define IMAGE_REL_M32R_ADDR32NB 0x0002
+#define IMAGE_REL_M32R_ADDR24 0x0003
+#define IMAGE_REL_M32R_GPREL16 0x0004
+#define IMAGE_REL_M32R_PCREL24 0x0005
+#define IMAGE_REL_M32R_PCREL16 0x0006
+#define IMAGE_REL_M32R_PCREL8 0x0007
+#define IMAGE_REL_M32R_REFHALF 0x0008
+#define IMAGE_REL_M32R_REFHI 0x0009
+#define IMAGE_REL_M32R_REFLO 0x000A
+#define IMAGE_REL_M32R_PAIR 0x000B
+#define IMAGE_REL_M32R_SECTION 0x000C
+#define IMAGE_REL_M32R_SECREL 0x000D
+#define IMAGE_REL_M32R_TOKEN 0x000E
+
+#define IMAGE_REL_MIPS_ABSOLUTE 0x0000
+#define IMAGE_REL_MIPS_REFHALF 0x0001
+#define IMAGE_REL_MIPS_REFWORD 0x0002
+#define IMAGE_REL_MIPS_JMPADDR 0x0003
+#define IMAGE_REL_MIPS_REFHI 0x0004
+#define IMAGE_REL_MIPS_REFLO 0x0005
+#define IMAGE_REL_MIPS_GPREL 0x0006
+#define IMAGE_REL_MIPS_LITERAL 0x0007
+#define IMAGE_REL_MIPS_SECTION 0x000A
+#define IMAGE_REL_MIPS_SECREL 0x000B
+#define IMAGE_REL_MIPS_SECRELLO 0x000C
+#define IMAGE_REL_MIPS_SECRELHI 0x000D
+#define IMAGE_REL_MIPS_JMPADDR16 0x0010
+#define IMAGE_REL_MIPS_REFWORDNB 0x0022
+#define IMAGE_REL_MIPS_PAIR 0x0025
+
#define IMAGE_REL_ALPHA_ABSOLUTE 0
#define IMAGE_REL_ALPHA_REFLONG 1
#define IMAGE_REL_ALPHA_REFQUAD 2