From 872e9216d0e49b4495fcf167d6019adf16d964ea Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Mon, 17 May 2004 00:51:34 +0000 Subject: [PATCH] Oops, use the generic ELF_ST_BIND() macro instead of ELF64_ST_BIND. Submitted by: marks --- sys/kern/link_elf_obj.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index b84aecd76e2b..519ff5c6f4eb 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -665,7 +665,7 @@ relocate_file(elf_file_t ef) symidx = ELF_R_SYM(rel->r_info); if (symidx < ef->ddbsymcnt) { sym = ef->ddbsymtab + symidx; - if (ELF64_ST_BIND(sym->st_info) != STB_LOCAL) { + if (ELF_ST_BIND(sym->st_info) != STB_LOCAL) { if (elf_reloc(&ef->lf, base, rel, ELF_RELOC_REL, elf_obj_lookup)) { symname = symbol_name(ef, rel->r_info); printf("link_elf: symbol %s undefined\n", symname); @@ -688,7 +688,7 @@ relocate_file(elf_file_t ef) symidx = ELF_R_SYM(rela->r_info); if (symidx < ef->ddbsymcnt) { sym = ef->ddbsymtab + symidx; - if (ELF64_ST_BIND(sym->st_info) != STB_LOCAL) { + if (ELF_ST_BIND(sym->st_info) != STB_LOCAL) { if (elf_reloc(&ef->lf, base, rela, ELF_RELOC_RELA, elf_obj_lookup)) { symname = symbol_name(ef, rela->r_info); printf("link_elf: symbol %s undefined\n", symname); @@ -854,7 +854,7 @@ elf_obj_lookup(linker_file_t lf, Elf_Word symidx, int deps) sym = ef->ddbsymtab + symidx; /* Theoretically we can avoid a lookup for some locals */ - switch (ELF64_ST_BIND(sym->st_info)) { + switch (ELF_ST_BIND(sym->st_info)) { case STB_LOCAL: /* Local, but undefined? huh? */ if (sym->st_shndx == SHN_UNDEF) @@ -922,7 +922,7 @@ link_elf_reloc_local(linker_file_t lf) symidx = ELF_R_SYM(rel->r_info); if (symidx < ef->ddbsymcnt) { sym = ef->ddbsymtab + symidx; - if (ELF64_ST_BIND(sym->st_info) == STB_LOCAL) + if (ELF_ST_BIND(sym->st_info) == STB_LOCAL) elf_reloc_local(lf, base, rel, ELF_RELOC_REL, elf_obj_lookup); } rel++; @@ -940,7 +940,7 @@ link_elf_reloc_local(linker_file_t lf) symidx = ELF_R_SYM(rela->r_info); if (symidx < ef->ddbsymcnt) { sym = ef->ddbsymtab + symidx; - if (ELF64_ST_BIND(sym->st_info) == STB_LOCAL) + if (ELF_ST_BIND(sym->st_info) == STB_LOCAL) elf_reloc_local(lf, base, rela, ELF_RELOC_RELA, elf_obj_lookup); } rela++;