diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2021-01-17 16:41:25 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2021-10-08 01:16:00 +0000 |
| commit | 969b06fdff5d54e6b0b130fd974ef683c075b7f3 (patch) | |
| tree | 144038cd9b0ba2b003065982e8e81cbc9c49fa24 | |
| parent | b9696aebdb184108286f22e59a01dd60932b5ca9 (diff) | |
| download | src-969b06fdff5d54e6b0b130fd974ef683c075b7f3.tar.gz src-969b06fdff5d54e6b0b130fd974ef683c075b7f3.zip | |
loader: Partial revert of 987eabdc2ae1
The arm relocation code doesn't not work and make loader not loading
dependancies.
Reported by: Dr. Rolf Jansen <freebsd-rj@obsigna.com>
(cherry picked from commit 0f2434ea000e02e6b1f7f40f489c346c64445242)
| -rw-r--r-- | stand/common/reloc_elf.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/stand/common/reloc_elf.c b/stand/common/reloc_elf.c index 388fea218aac..b45c3295966e 100644 --- a/stand/common/reloc_elf.c +++ b/stand/common/reloc_elf.c @@ -200,8 +200,7 @@ __elfN(reloc)(struct elf_file *ef, symaddr_fn *symaddr, const void *reldata, } return (0); -#elif defined(__aarch64__) || defined(__arm__) || defined(__powerpc__) || \ - defined(__riscv) +#elif defined(__aarch64__) || defined(__powerpc__) || defined(__riscv) Elf_Size w; const Elf_Rela *rela; @@ -213,8 +212,6 @@ __elfN(reloc)(struct elf_file *ef, symaddr_fn *symaddr, const void *reldata, switch (ELF_R_TYPE(rela->r_info)) { #if defined(__aarch64__) case R_AARCH64_RELATIVE: -#elif defined(__arm__) - case R_ARM_RELATIVE: #elif defined(__powerpc__) case R_PPC_RELATIVE: #elif defined(__riscv) |