diff options
author | marcel <marcel@FreeBSD.org> | 2005-12-18 04:52:37 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2005-12-18 04:52:37 +0000 |
commit | 0a081d09f4f7db02d1baa4889eb218e2eff4097a (patch) | |
tree | c8421e79058b3959c09903a706bc77c9de3e7087 /sys/kern | |
parent | 3394701ae17fa6037d9dc3f0da623707988cb02a (diff) | |
download | FreeBSD-src-0a081d09f4f7db02d1baa4889eb218e2eff4097a.zip FreeBSD-src-0a081d09f4f7db02d1baa4889eb218e2eff4097a.tar.gz |
Make our ELF64 type definitions match standards. In particular this
means:
o Remove Elf64_Quarter,
o Redefine Elf64_Half to be 16-bit,
o Redefine Elf64_Word to be 32-bit,
o Add Elf64_Xword and Elf64_Sxword for 64-bit entities,
o Use Elf_Size in MI code to abstract the difference between
Elf32_Word and Elf64_Word.
o Add Elf_Ssize as the signed counterpart of Elf_Size.
MFC after: 2 weeks
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/link_elf.c | 10 | ||||
-rw-r--r-- | sys/kern/link_elf_obj.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 29b54e5..7b3f1ab 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -120,7 +120,7 @@ static int link_elf_each_function_name(linker_file_t, int (*)(const char *, void *), void *); static void link_elf_reloc_local(linker_file_t); -static Elf_Addr elf_lookup(linker_file_t lf, Elf_Word symidx, int deps); +static Elf_Addr elf_lookup(linker_file_t lf, Elf_Size symidx, int deps); static kobj_method_t link_elf_methods[] = { KOBJMETHOD(linker_lookup_symbol, link_elf_lookup_symbol), @@ -909,7 +909,7 @@ link_elf_unload_preload(linker_file_t file) } static const char * -symbol_name(elf_file_t ef, Elf_Word r_info) +symbol_name(elf_file_t ef, Elf_Size r_info) { const Elf_Sym *ref; @@ -1232,7 +1232,7 @@ link_elf_get_gp(linker_file_t lf) #endif const Elf_Sym * -elf_get_sym(linker_file_t lf, Elf_Word symidx) +elf_get_sym(linker_file_t lf, Elf_Size symidx) { elf_file_t ef = (elf_file_t)lf; @@ -1242,7 +1242,7 @@ elf_get_sym(linker_file_t lf, Elf_Word symidx) } const char * -elf_get_symname(linker_file_t lf, Elf_Word symidx) +elf_get_symname(linker_file_t lf, Elf_Size symidx) { elf_file_t ef = (elf_file_t)lf; const Elf_Sym *sym; @@ -1261,7 +1261,7 @@ elf_get_symname(linker_file_t lf, Elf_Word symidx) * the case that the symbol can be found through the hash table. */ static Elf_Addr -elf_lookup(linker_file_t lf, Elf_Word symidx, int deps) +elf_lookup(linker_file_t lf, Elf_Size symidx, int deps) { elf_file_t ef = (elf_file_t)lf; const Elf_Sym *sym; diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index a338610..de43b7a 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -124,7 +124,7 @@ static int link_elf_each_function_name(linker_file_t, int (*)(const char *, void *), void *); static void link_elf_reloc_local(linker_file_t); -static Elf_Addr elf_obj_lookup(linker_file_t lf, Elf_Word symidx, int deps); +static Elf_Addr elf_obj_lookup(linker_file_t lf, Elf_Size symidx, int deps); static kobj_method_t link_elf_methods[] = { KOBJMETHOD(linker_lookup_symbol, link_elf_lookup_symbol), @@ -843,7 +843,7 @@ link_elf_unload_file(linker_file_t file) } static const char * -symbol_name(elf_file_t ef, Elf_Word r_info) +symbol_name(elf_file_t ef, Elf_Size r_info) { const Elf_Sym *ref; @@ -879,7 +879,7 @@ relocate_file(elf_file_t ef) const char *symname; const Elf_Sym *sym; int i; - Elf_Word symidx; + Elf_Size symidx; Elf_Addr base; @@ -1069,7 +1069,7 @@ link_elf_each_function_name(linker_file_t file, * the case that the symbol can be found through the hash table. */ static Elf_Addr -elf_obj_lookup(linker_file_t lf, Elf_Word symidx, int deps) +elf_obj_lookup(linker_file_t lf, Elf_Size symidx, int deps) { elf_file_t ef = (elf_file_t)lf; const Elf_Sym *sym; @@ -1122,7 +1122,7 @@ link_elf_reloc_local(linker_file_t lf) const Elf_Sym *sym; Elf_Addr base; int i; - Elf_Word symidx; + Elf_Size symidx; /* Perform relocations without addend if there are any: */ for (i = 0; i < ef->nrel; i++) { |