2009-06-26 Pavel Roskin <proski@gnu.org>
* include/grub/types.h: Define GRUB_TARGET_WORDSIZE. * include/grub/elf.h: Define symbols without "32" or "64" based on GRUB_TARGET_WORDSIZE. * include/grub/multiboot2.h: Use GRUB_TARGET_WORDSIZE. * efiemu/loadcore32.c: Redefine GRUB_TARGET_WORDSIZE, remove own ELF definitions. * efiemu/loadcore64.c: Likewise. * loader/i386/bsd32.c: Likewise. * loader/i386/bsd64.c: Likewise. * kern/dl.c: Remove own ELF definitions. * util/i386/efi/grub-mkimage.c: Likewise.
This commit is contained in:
parent
9bbdfd4d3b
commit
c402ab1734
10 changed files with 71 additions and 81 deletions
24
kern/dl.c
24
kern/dl.c
|
@ -29,30 +29,6 @@
|
|||
#include <grub/env.h>
|
||||
#include <grub/cache.h>
|
||||
|
||||
#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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue