From d09c112c3ec021d3dda720b1bab6d98a27416a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 22 Oct 2007 00:43:22 +0000 Subject: [PATCH] - Yes we will have 64bit atomic funcs! Watch this PPC! :P - m68k ELF reloc names. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22656 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../private/kernel/arch/m68k/arch_config.h | 2 +- headers/private/kernel/arch/m68k/arch_elf.h | 64 ++++++++----------- 2 files changed, 27 insertions(+), 39 deletions(-) diff --git a/headers/private/kernel/arch/m68k/arch_config.h b/headers/private/kernel/arch/m68k/arch_config.h index af17b83634..ecdea8867b 100644 --- a/headers/private/kernel/arch/m68k/arch_config.h +++ b/headers/private/kernel/arch/m68k/arch_config.h @@ -11,7 +11,7 @@ #define STACK_GROWS_DOWNWARDS //#define ATOMIC_FUNCS_ARE_SYSCALLS -#define ATOMIC64_FUNCS_ARE_SYSCALLS +//#define ATOMIC64_FUNCS_ARE_SYSCALLS #endif /* _KERNEL_ARCH_M68K_CONFIG_H */ diff --git a/headers/private/kernel/arch/m68k/arch_elf.h b/headers/private/kernel/arch/m68k/arch_elf.h index 56ce6d009c..93d0d28050 100644 --- a/headers/private/kernel/arch/m68k/arch_elf.h +++ b/headers/private/kernel/arch/m68k/arch_elf.h @@ -7,43 +7,31 @@ /* relocation types */ -#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 -#define R_PPC_ADDR30 37 +#define R_68K_NONE 0 +#define R_68K_32 1 /* Direct 32 bit */ +#define R_68K_16 2 /* Direct 16 bit */ +#define R_68K_8 3 /* Direct 8 bit */ +#define R_68K_PC32 4 /* PC relative 32 bit */ +#define R_68K_PC16 5 /* PC relative 16 bit */ +#define R_68K_PC8 6 /* PC relative 8 bit */ +#define R_68K_GOT32 7 /* 32 bit PC relative GOT entry */ +#define R_68K_GOT16 8 /* 16 bit PC relative GOT entry */ +#define R_68K_GOT8 9 /* 8 bit PC relative GOT entry */ +#define R_68K_GOT32O 10 /* 32 bit GOT offset */ +#define R_68K_GOT16O 11 /* 16 bit GOT offset */ +#define R_68K_GOT8O 12 /* 8 bit GOT offset */ +#define R_68K_PLT32 13 /* 32 bit PC relative PLT address */ +#define R_68K_PLT16 14 /* 16 bit PC relative PLT address */ +#define R_68K_PLT8 15 /* 8 bit PC relative PLT address */ +#define R_68K_PLT32O 16 /* 32 bit PLT offset */ +#define R_68K_PLT16O 17 /* 16 bit PLT offset */ +#define R_68K_PLT8O 18 /* 8 bit PLT offset */ +#define R_68K_COPY 19 /* Copy symbol at runtime */ +#define R_68K_GLOB_DAT 20 /* Create GOT entry */ +#define R_68K_JMP_SLOT 21 /* Create PLT entry */ +#define R_68K_RELATIVE 22 /* Adjust by program base */ +/* These are GNU extensions to enable C++ vtable garbage collection. */ +#define R_68K_GNU_VTINHERIT 23 +#define R_68K_GNU_VTENTRY 24 #endif /* _KERNEL_ARCH_M68K_ELF_H */