Select default ELF format in include/grub/elf.h From: Pavel Roskin ChangeLog: * include/grub/elf.h: Define symbols for 32-bit or 64-bit ELF based on DEFAULT_ELF_BITS. Default to the target word size. * efiemu/loadcore32.c: Use DEFAULT_ELF_BITS instead of own definitions. * efiemu/loadcore64.c: Likewise. * loader/i386/bsd32.c: Likewise. * loader/i386/bsd64.c: Likewise. * kern/dl.c: Remove ELF definitions. * util/i386/efi/grub-mkimage.c: Likewise. --- efiemu/loadcore32.c | 7 +------ efiemu/loadcore64.c | 7 +------ include/grub/elf.h | 44 ++++++++++++++++++++++++++++++++++++++++++ kern/dl.c | 24 ----------------------- loader/i386/bsd32.c | 4 +--- loader/i386/bsd64.c | 4 +--- util/i386/efi/grub-mkimage.c | 34 -------------------------------- 7 files changed, 48 insertions(+), 76 deletions(-) diff --git a/efiemu/loadcore32.c b/efiemu/loadcore32.c index b4f61c7..4e0fcc5 100644 --- a/efiemu/loadcore32.c +++ b/efiemu/loadcore32.c @@ -18,10 +18,5 @@ */ #define SUFFIX(x) x ## 32 -#define Elf_Ehdr Elf32_Ehdr -#define Elf_Shdr Elf32_Shdr -#define Elf_Sym Elf32_Sym -#define Elf_Word Elf32_Word -#define ELF_ST_TYPE ELF32_ST_TYPE -#define ELF_ST_BIND ELF32_ST_BIND +#define DEFAULT_ELF_BITS 32 #include "loadcore.c" diff --git a/efiemu/loadcore64.c b/efiemu/loadcore64.c index 097276c..3c5cc54 100644 --- a/efiemu/loadcore64.c +++ b/efiemu/loadcore64.c @@ -18,10 +18,5 @@ */ #define SUFFIX(x) x ## 64 -#define Elf_Ehdr Elf64_Ehdr -#define Elf_Shdr Elf64_Shdr -#define Elf_Sym Elf64_Sym -#define Elf_Word Elf64_Word -#define ELF_ST_TYPE ELF64_ST_TYPE -#define ELF_ST_BIND ELF64_ST_BIND +#define DEFAULT_ELF_BITS 64 #include "loadcore.c" diff --git a/include/grub/elf.h b/include/grub/elf.h index 319bc7c..23a8415 100644 --- a/include/grub/elf.h +++ b/include/grub/elf.h @@ -2330,4 +2330,48 @@ typedef Elf32_Addr Elf32_Conflict; #define R_X86_64_NUM 24 +#ifndef DEFAULT_ELF_BITS +#define DEFAULT_ELF_BITS (8 * GRUB_TARGET_SIZEOF_VOID_P) +#endif + +#if DEFAULT_ELF_BITS == 32 + +typedef Elf32_Addr Elf_Addr; +typedef Elf32_Ehdr Elf_Ehdr; +typedef Elf32_Half Elf_Half; +typedef Elf32_Off Elf_Off; +typedef Elf32_Rel Elf_Rel; +typedef Elf32_Rela Elf_Rela; +typedef Elf32_Section Elf_Section; +typedef Elf32_Shdr Elf_Shdr; +typedef Elf32_Sym Elf_Sym; +typedef Elf32_Word Elf_Word; + +#define ELF_ST_BIND(val) ELF32_ST_BIND(val) +#define ELF_ST_TYPE(val) ELF32_ST_TYPE(val) +#define ELF_R_SYM(val) ELF32_R_SYM(val) +#define ELF_R_TYPE(val) ELF32_R_TYPE(val) +#define ELF_R_INFO(sym, type) ELF32_R_INFO(sym, type) + +#elif DEFAULT_ELF_BITS == 64 + +typedef Elf64_Addr Elf_Addr; +typedef Elf64_Ehdr Elf_Ehdr; +typedef Elf64_Half Elf_Half; +typedef Elf64_Off Elf_Off; +typedef Elf64_Rel Elf_Rel; +typedef Elf64_Rela Elf_Rela; +typedef Elf64_Section Elf_Section; +typedef Elf64_Shdr Elf_Shdr; +typedef Elf64_Sym Elf_Sym; +typedef Elf64_Word Elf_Word; + +#define ELF_ST_BIND(val) ELF64_ST_BIND (val) +#define ELF_ST_TYPE(val) ELF64_ST_TYPE (val) +#define ELF_R_SYM(val) ELF64_R_SYM(val) +#define ELF_R_TYPE(val) ELF64_R_TYPE(val) +#define ELF_R_INFO(sym, type) ELF64_R_INFO(sym, type) + +#endif /* DEFAULT_ELF_BITS == 64 */ + #endif /* ! GRUB_ELF_H */ diff --git a/kern/dl.c b/kern/dl.c index d729c08..cd34e31 100644 --- a/kern/dl.c +++ b/kern/dl.c @@ -29,30 +29,6 @@ #include #include -#if GRUB_CPU_SIZEOF_VOID_P == 4 - -typedef Elf32_Word Elf_Word; -typedef Elf32_Addr Elf_Addr; -typedef Elf32_Ehdr Elf_Ehdr; -typedef Elf32_Shdr Elf_Shdr; -typedef Elf32_Sym Elf_Sym; - -# define ELF_ST_BIND(val) ELF32_ST_BIND (val) -# define ELF_ST_TYPE(val) ELF32_ST_TYPE (val) - -#elif GRUB_CPU_SIZEOF_VOID_P == 8 - -typedef Elf64_Word Elf_Word; -typedef Elf64_Addr Elf_Addr; -typedef Elf64_Ehdr Elf_Ehdr; -typedef Elf64_Shdr Elf_Shdr; -typedef Elf64_Sym Elf_Sym; - -# define ELF_ST_BIND(val) ELF64_ST_BIND (val) -# define ELF_ST_TYPE(val) ELF64_ST_TYPE (val) - -#endif - struct grub_dl_list diff --git a/loader/i386/bsd32.c b/loader/i386/bsd32.c index 24dab6c..a4fa48c 100644 --- a/loader/i386/bsd32.c +++ b/loader/i386/bsd32.c @@ -1,7 +1,5 @@ #define SUFFIX(x) x ## 32 -#define Elf_Ehdr Elf32_Ehdr -#define Elf_Shdr Elf32_Shdr -#define Elf_Sym Elf32_Sym +#define DEFAULT_ELF_BITS 32 #define OBJSYM 0 #include typedef grub_uint32_t grub_freebsd_addr_t; diff --git a/loader/i386/bsd64.c b/loader/i386/bsd64.c index f4ff8b2..8e3eba9 100644 --- a/loader/i386/bsd64.c +++ b/loader/i386/bsd64.c @@ -1,7 +1,5 @@ #define SUFFIX(x) x ## 64 -#define Elf_Ehdr Elf64_Ehdr -#define Elf_Shdr Elf64_Shdr -#define Elf_Sym Elf64_Sym +#define DEFAULT_ELF_BITS 64 #define OBJSYM 1 #include typedef grub_uint64_t grub_freebsd_addr_t; diff --git a/util/i386/efi/grub-mkimage.c b/util/i386/efi/grub-mkimage.c index 2813e79..a92e6da 100644 --- a/util/i386/efi/grub-mkimage.c +++ b/util/i386/efi/grub-mkimage.c @@ -32,43 +32,9 @@ #include #if GRUB_TARGET_SIZEOF_VOID_P == 4 - -typedef Elf32_Word Elf_Word; -typedef Elf32_Addr Elf_Addr; -typedef Elf32_Ehdr Elf_Ehdr; -typedef Elf32_Shdr Elf_Shdr; -typedef Elf32_Sym Elf_Sym; -typedef Elf32_Half Elf_Half; -typedef Elf32_Off Elf_Off; -typedef Elf32_Section Elf_Section; -typedef Elf32_Rel Elf_Rel; -typedef Elf32_Rela Elf_Rela; - -#define ELF_R_SYM ELF32_R_SYM -#define ELF_R_TYPE ELF32_R_TYPE -#define ELF_R_INFO ELF32_R_INFO - #define grub_le_to_cpu grub_le_to_cpu32 - #elif GRUB_TARGET_SIZEOF_VOID_P == 8 - -typedef Elf64_Word Elf_Word; -typedef Elf64_Addr Elf_Addr; -typedef Elf64_Ehdr Elf_Ehdr; -typedef Elf64_Shdr Elf_Shdr; -typedef Elf64_Sym Elf_Sym; -typedef Elf64_Half Elf_Half; -typedef Elf64_Off Elf_Off; -typedef Elf64_Section Elf_Section; -typedef Elf64_Rel Elf_Rel; -typedef Elf64_Rela Elf_Rela; - -#define ELF_R_SYM ELF64_R_SYM -#define ELF_R_TYPE ELF64_R_TYPE -#define ELF_R_INFO ELF64_R_INFO - #define grub_le_to_cpu grub_le_to_cpu64 - #endif static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB;