From: Andreas Schwab Date: Tue, 15 May 2018 11:47:02 +0000 (+0200) Subject: backends: add checks for _GLOBAL_OFFSET_TABLE_ and __global_pointer$ on riscv X-Git-Tag: elfutils-0.171~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9279076c5149ce041b3720dac002f176a5cbc3b2;p=thirdparty%2Felfutils.git backends: add checks for _GLOBAL_OFFSET_TABLE_ and __global_pointer$ on riscv Signed-off-by: Andreas Schwab --- diff --git a/backends/ChangeLog b/backends/ChangeLog index 63bb7e444..0dde0ff3f 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,8 @@ +2018-05-15 Andreas Schwab + + * riscv_init.c (riscv_init): Hook check_special_symbol. + * riscv_symbol.c (riscv_check_special_symbol): New function. + 2018-04-19 Andreas Schwab * Makefile.am (modules): Add riscv. diff --git a/backends/riscv_init.c b/backends/riscv_init.c index 761d9c2e1..80be86d3c 100644 --- a/backends/riscv_init.c +++ b/backends/riscv_init.c @@ -51,6 +51,7 @@ riscv_init (Elf *elf __attribute__ ((unused)), eh->name = "RISC-V"; riscv_init_reloc (eh); HOOK (eh, reloc_simple_type); + HOOK (eh, check_special_symbol); HOOK (eh, machine_flag_check); return MODVERSION; diff --git a/backends/riscv_symbol.c b/backends/riscv_symbol.c index 628e0572a..dce8e3586 100644 --- a/backends/riscv_symbol.c +++ b/backends/riscv_symbol.c @@ -60,3 +60,35 @@ riscv_machine_flag_check (GElf_Word flags) return ((flags &~ (EF_RISCV_RVC | EF_RISCV_FLOAT_ABI)) == 0); } + +/* Check whether given symbol's st_value and st_size are OK despite failing + normal checks. */ +bool +riscv_check_special_symbol (Elf *elf, GElf_Ehdr *ehdr, const GElf_Sym *sym, + const char *name, const GElf_Shdr *destshdr) +{ + if (name == NULL) + return false; + + const char *sname = elf_strptr (elf, ehdr->e_shstrndx, destshdr->sh_name); + if (sname == NULL) + return false; + + /* _GLOBAL_OFFSET_TABLE_ points to the start of the .got section, but it + is preceded by the .got.plt section in the output .got section. */ + if (strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0) + return (strcmp (sname, ".got") == 0 + && sym->st_value >= destshdr->sh_addr + && sym->st_value < destshdr->sh_addr + destshdr->sh_size); + + /* __global_pointer$ points to the .sdata section with an offset of + 0x800. It might however fall in the .got section, in which case we + cannot check the offset. The size always should be zero. */ + if (strcmp (name, "__global_pointer$") == 0) + return (((strcmp (sname, ".sdata") == 0 + && sym->st_value == destshdr->sh_addr + 0x800) + || strcmp (sname, ".got") == 0) + && sym->st_size == 0); + + return false; +}