Rewrite relocation definition using macros.

3 files changed, 118 insertions, 67 deletions

diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 8bfac7a..da0b96a 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,6 +1,8 @@
 1998-07-22 13:07  Ulrich Drepper  <drepper@cygnus.com>
 
 	* mn10300.h: Rewrite relocation definition using macros.
+	* mips.h: Likewise.
+	* ppc.h: Likewise.
 
 1998-07-21 13:07  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/include/elf/mips.h b/include/elf/mips.h
index 24cf60e..770d3bd 100644
--- a/include/elf/mips.h
+++ b/include/elf/mips.h
@@ -28,19 +28,60 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define _ELF_MIPS_H
 
 /* Relocation types.  */
-#define R_MIPS_NONE	0
-#define R_MIPS_16	1
-#define R_MIPS_32	2
-#define R_MIPS_REL32	3
-#define R_MIPS_26	4
-#define R_MIPS_HI16	5
-#define R_MIPS_LO16	6
-#define R_MIPS_GPREL16	7
-#define R_MIPS_LITERAL	8
-#define R_MIPS_GOT16	9
-#define R_MIPS_PC16	10
-#define R_MIPS_CALL16	11
-#define R_MIPS_GPREL32	12
+START_RELOC_NUMBERS (elf_mips_reloc_type)
+  RELOC_NUMBER (R_MIPS_NONE, 0)
+  RELOC_NUMBER (R_MIPS_16, 1)
+  RELOC_NUMBER (R_MIPS_32, 2)
+  RELOC_NUMBER (R_MIPS_REL32, 3)
+  RELOC_NUMBER (R_MIPS_26, 4)
+  RELOC_NUMBER (R_MIPS_HI16, 5)
+  RELOC_NUMBER (R_MIPS_LO16, 6)
+  RELOC_NUMBER (R_MIPS_GPREL16, 7)
+  RELOC_NUMBER (R_MIPS_LITERAL, 8)
+  RELOC_NUMBER (R_MIPS_GOT16, 9)
+  RELOC_NUMBER (R_MIPS_PC16, 10)
+  RELOC_NUMBER (R_MIPS_CALL16, 11)
+  RELOC_NUMBER (R_MIPS_GPREL32	12)
+  /* The remaining relocs are defined on Irix, although they are not
+     in the MIPS ELF ABI.  */
+  RELOC_NUMBER (R_MIPS_UNUSED1, 13)
+  RELOC_NUMBER (R_MIPS_UNUSED2, 14)
+  RELOC_NUMBER (R_MIPS_UNUSED3, 15)
+  RELOC_NUMBER (R_MIPS_SHIFT5, 16)
+  RELOC_NUMBER (R_MIPS_SHIFT6, 17)
+  RELOC_NUMBER (R_MIPS_64, 18)
+  RELOC_NUMBER (R_MIPS_GOT_DISP, 19)
+  RELOC_NUMBER (R_MIPS_GOT_PAGE, 20)
+  RELOC_NUMBER (R_MIPS_GOT_OFST, 21)
+  RELOC_NUMBER (R_MIPS_GOT_HI16, 22)
+  RELOC_NUMBER (R_MIPS_GOT_LO16, 23)
+  RELOC_NUMBER (R_MIPS_SUB, 24)
+  RELOC_NUMBER (R_MIPS_INSERT_A, 25)
+  RELOC_NUMBER (R_MIPS_INSERT_B, 26)
+  RELOC_NUMBER (R_MIPS_DELETE, 27)
+  RELOC_NUMBER (R_MIPS_HIGHER, 28)
+  RELOC_NUMBER (R_MIPS_HIGHEST, 29)
+  RELOC_NUMBER (R_MIPS_CALL_HI16, 30)
+  RELOC_NUMBER (R_MIPS_CALL_LO16, 31)
+/* start-sanitize-r5900 */
+  /* This is used by a mips co-processor instruction.  */
+  RELOC_NUMBER (R_MIPS15_S3, 32)
+/* end-sanitize-r5900 */
+  RELOC_NUMBER (R_MIPS_max, 33)
+  /* These relocs are used for the mips16.  */
+  RELOC_NUMBER (R_MIPS16_26, 100)
+  RELOC_NUMBER (R_MIPS16_GPREL, 101)
+/* start-sanitize-sky */
+  /* These relocs are for the dvp.  */
+  RELOC_NUMBER (R_MIPS_DVP_11_PCREL, 120)
+  RELOC_NUMBER (R_MIPS_DVP_27_S4, 121)
+  RELOC_NUMBER (R_MIPS_DVP_11_S4, 122)
+  RELOC_NUMBER (R_MIPS_DVP_U15_S3, 123)
+/* end-sanitize-sky */
+  /* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_MIPS_GNU_VTINHERIT, 253)
+  RELOC_NUMBER (R_MIPS_GNU_VTENTRY, 254)
+END_RELOC_NUMBERS
 
 /* Processor specific flags for the ELF header e_flags field.  */
 
diff --git a/include/elf/ppc.h b/include/elf/ppc.h
index 9dbb65c..1343b32 100644
--- a/include/elf/ppc.h
+++ b/include/elf/ppc.h
@@ -28,66 +28,74 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define _ELF_PPC_H
 
 /* Relocations.  */
-#define R_PPC_NONE		0
-#define R_PPC_ADDR32		1
-#define R_PPC_ADDR24		2
-#define R_PPC_ADDR16		3
-#define R_PPC_ADDR16_LO		4
-#define R_PPC_ADDR16_HI		5
-#define R_PPC_ADDR16_HA		6
-#define R_PPC_ADDR14		7
-#define R_PPC_ADDR14_BRTAKEN	8
-#define R_PPC_ADDR14_BRNTAKEN	9
-#define R_PPC_REL24		10
-#define R_PPC_REL14		11
-#define R_PPC_REL14_BRTAKEN	12
-#define R_PPC_REL14_BRNTAKEN	13
-#define R_PPC_GOT16		14
-#define R_PPC_GOT16_LO		15
-#define R_PPC_GOT16_HI		16
-#define R_PPC_GOT16_HA		17
-#define R_PPC_PLTREL24		18
-#define R_PPC_COPY		19
-#define R_PPC_GLOB_DAT		20
-#define R_PPC_JMP_SLOT		21
-#define R_PPC_RELATIVE		22
-#define R_PPC_LOCAL24PC		23
-#define R_PPC_UADDR32		24
-#define R_PPC_UADDR16		25
-#define R_PPC_REL32		26
-#define R_PPC_PLT32		27
-#define R_PPC_PLTREL32		28
-#define R_PPC_PLT16_LO		29
-#define R_PPC_PLT16_HI		30
-#define R_PPC_PLT16_HA		31
-#define R_PPC_SDAREL16		32
-#define R_PPC_SECTOFF		33
-#define R_PPC_SECTOFF_LO	34
-#define R_PPC_SECTOFF_HI	35
-#define R_PPC_SECTOFF_HA	36
+START_RELOC_NUMBERS (elf_ppc_reloc_type)
+  RELOC_NUMBER (R_PPC_NONE, 0)
+  RELOC_NUMBER (R_PPC_ADDR32, 1)
+  RELOC_NUMBER (R_PPC_ADDR24, 2)
+  RELOC_NUMBER (R_PPC_ADDR16, 3)
+  RELOC_NUMBER (R_PPC_ADDR16_LO, 4)
+  RELOC_NUMBER (R_PPC_ADDR16_HI, 5)
+  RELOC_NUMBER (R_PPC_ADDR16_HA, 6)
+  RELOC_NUMBER (R_PPC_ADDR14, 7)
+  RELOC_NUMBER (R_PPC_ADDR14_BRTAKEN, 8)
+  RELOC_NUMBER (R_PPC_ADDR14_BRNTAKEN, 9)
+  RELOC_NUMBER (R_PPC_REL24, 10)
+  RELOC_NUMBER (R_PPC_REL14, 11)
+  RELOC_NUMBER (R_PPC_REL14_BRTAKEN, 12)
+  RELOC_NUMBER (R_PPC_REL14_BRNTAKEN, 13)
+  RELOC_NUMBER (R_PPC_GOT16, 14)
+  RELOC_NUMBER (R_PPC_GOT16_LO, 15)
+  RELOC_NUMBER (R_PPC_GOT16_HI, 16)
+  RELOC_NUMBER (R_PPC_GOT16_HA, 17)
+  RELOC_NUMBER (R_PPC_PLTREL24, 18)
+  RELOC_NUMBER (R_PPC_COPY, 19)
+  RELOC_NUMBER (R_PPC_GLOB_DAT, 20)
+  RELOC_NUMBER (R_PPC_JMP_SLOT, 21)
+  RELOC_NUMBER (R_PPC_RELATIVE, 22)
+  RELOC_NUMBER (R_PPC_LOCAL24PC, 23)
+  RELOC_NUMBER (R_PPC_UADDR32, 24)
+  RELOC_NUMBER (R_PPC_UADDR16, 25)
+  RELOC_NUMBER (R_PPC_REL32, 26)
+  RELOC_NUMBER (R_PPC_PLT32, 27)
+  RELOC_NUMBER (R_PPC_PLTREL32, 28)
+  RELOC_NUMBER (R_PPC_PLT16_LO, 29)
+  RELOC_NUMBER (R_PPC_PLT16_HI, 30)
+  RELOC_NUMBER (R_PPC_PLT16_HA, 31)
+  RELOC_NUMBER (R_PPC_SDAREL16, 32)
+  RELOC_NUMBER (R_PPC_SECTOFF, 33)
+  RELOC_NUMBER (R_PPC_SECTOFF_LO, 34)
+  RELOC_NUMBER (R_PPC_SECTOFF_HI, 35)
+  RELOC_NUMBER (R_PPC_SECTOFF_HA, 36)
 
 /* The remaining relocs are from the Embedded ELF ABI, and are not
    in the SVR4 ELF ABI.  */
-#define R_PPC_EMB_NADDR32	101
-#define R_PPC_EMB_NADDR16	102
-#define R_PPC_EMB_NADDR16_LO	103
-#define R_PPC_EMB_NADDR16_HI	104
-#define R_PPC_EMB_NADDR16_HA	105
-#define R_PPC_EMB_SDAI16	106
-#define R_PPC_EMB_SDA2I16	107
-#define R_PPC_EMB_SDA2REL	108
-#define R_PPC_EMB_SDA21		109
-#define R_PPC_EMB_MRKREF	110
-#define R_PPC_EMB_RELSEC16	111
-#define R_PPC_EMB_RELST_LO	112
-#define R_PPC_EMB_RELST_HI	113
-#define R_PPC_EMB_RELST_HA	114
-#define R_PPC_EMB_BIT_FLD	115
-#define R_PPC_EMB_RELSDA	116
+  RELOC_NUMBER (R_PPC_EMB_NADDR32, 101)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16, 102)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16_LO, 103)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16_HI, 104)
+  RELOC_NUMBER (R_PPC_EMB_NADDR16_HA, 105)
+  RELOC_NUMBER (R_PPC_EMB_SDAI16, 106)
+  RELOC_NUMBER (R_PPC_EMB_SDA2I16, 107)
+  RELOC_NUMBER (R_PPC_EMB_SDA2REL, 108)
+  RELOC_NUMBER (R_PPC_EMB_SDA21, 109)
+  RELOC_NUMBER (R_PPC_EMB_MRKREF, 110)
+  RELOC_NUMBER (R_PPC_EMB_RELSEC16, 111)
+  RELOC_NUMBER (R_PPC_EMB_RELST_LO, 112)
+  RELOC_NUMBER (R_PPC_EMB_RELST_HI, 113)
+  RELOC_NUMBER (R_PPC_EMB_RELST_HA, 114)
+  RELOC_NUMBER (R_PPC_EMB_BIT_FLD, 115)
+  RELOC_NUMBER (R_PPC_EMB_RELSDA, 116)
+
+  /* These are GNU extensions to enable C++ vtable garbage collection.  */
+  RELOC_NUMBER (R_PPC_GNU_VTINHERIT, 253)
+  RELOC_NUMBER (R_PPC_GNU_VTENTRY, 254)
 
 /* This is a phony reloc to handle any old fashioned TOC16 references
    that may still be in object files.  */
-#define R_PPC_TOC16		255
+  RELOC_NUMBER (R_PPC_TOC16, 255)
+
+  RELOC_NUMBER (R_PPC_max, 256)
+END_RELOC_NUMBERS
 
 
 /* Processor specific flags for the ELF header e_flags field.  */