From 24a77a11114b5d8b8b89f8be646e21a19f3ce23f Mon Sep 17 00:00:00 2001 From: freza Date: Sat, 25 Nov 2006 18:04:33 +0000 Subject: [PATCH] PR toolchain/35105: Don't include reloc.h, instead provide R_PPC_* defines and make R_TYPE() use them. This is more consistent with other ports, too. Suggested by Manuel Bouyer, ok'd by Matt Thomas. --- sys/arch/powerpc/include/elf_machdep.h | 38 ++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/sys/arch/powerpc/include/elf_machdep.h b/sys/arch/powerpc/include/elf_machdep.h index c908fd0dd343..fdd2533552a9 100644 --- a/sys/arch/powerpc/include/elf_machdep.h +++ b/sys/arch/powerpc/include/elf_machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: elf_machdep.h,v 1.6 2006/07/08 06:36:42 ross Exp $ */ +/* $NetBSD: elf_machdep.h,v 1.7 2006/11/25 18:04:33 freza Exp $ */ #define ELF32_MACHDEP_ENDIANNESS ELFDATA2MSB #define ELF32_MACHDEP_ID_CASES \ @@ -19,6 +19,38 @@ #define ARCH_ELFSIZE 32 /* MD native binary size */ #endif -#include /* XXX */ +#define R_PPC_NONE 0 +#define R_PPC_32 1 +#define R_PPC_24 2 +#define R_PPC_16 3 +#define R_PPC_16_LO 4 +#define R_PPC_16_HI 5 /* R_PPC_ADDIS */ +#define R_PPC_16_HA 6 +#define R_PPC_14 7 +#define R_PPC_14_TAKEN 8 +#define R_PPC_14_NTAKEN 9 +#define R_PPC_REL24 10 /* R_PPC_BRANCH */ +#define R_PPC_REL14 11 +#define R_PPC_REL14_TAKEN 12 +#define R_PPC_REL14_NTAKEN 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_PLT24 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_U32 24 +#define R_PPC_U16 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_SDAREL 32 -#define R_TYPE(name) __CONCAT(RELOC_,name) +#define R_TYPE(name) __CONCAT(R_PPC_,name)