d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: Partial revert of 987eabdc2ae1

Browse Source 
The arm relocation code doesn't not work and make loader not loading
dependancies.

Reported by:	Dr. Rolf Jansen <freebsd-rj@obsigna.com>
This commit is contained in:
Emmanuel Vadot 2021-01-17 17:41:25 +01:00
parent 5c6c1b5421
commit 0f2434ea00
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stand/common/reloc_elf.c
View File

@ -175,8 +175,7 @@ __elfN(reloc)(struct elf_file *ef, symaddr_fn *symaddr, const void *reldata,
} }
return (0); return (0);
#elif defined(__aarch64__) || defined(__arm__) || defined(__powerpc__) || \ #elif defined(__aarch64__) || defined(__powerpc__) || defined(__riscv)
defined(__riscv)
Elf_Size w; Elf_Size w;
const Elf_Rela *rela; const Elf_Rela *rela;
@ -188,8 +187,6 @@ __elfN(reloc)(struct elf_file *ef, symaddr_fn *symaddr, const void *reldata,
switch (ELF_R_TYPE(rela->r_info)) { switch (ELF_R_TYPE(rela->r_info)) {
#if defined(__aarch64__) #if defined(__aarch64__)
case R_AARCH64_RELATIVE: case R_AARCH64_RELATIVE:
#elif defined(__arm__)
case R_ARM_RELATIVE:
#elif defined(__powerpc__) #elif defined(__powerpc__)
case R_PPC_RELATIVE: case R_PPC_RELATIVE:
#elif defined(__riscv) #elif defined(__riscv)