The branch main has been updated by manu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0f2434ea000e02e6b1f7f40f489c346c64445242
commit 0f2434ea000e02e6b1f7f40f489c346c64445242
Author: Emmanuel Vadot <m...@freebsd.org>
AuthorDate: 2021-01-17 16:41:25 +0000
Commit: Emmanuel Vadot <m...@freebsd.org>
CommitDate: 2021-01-17 16:41:25 +0000
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...@obsigna.com>
---
stand/common/reloc_elf.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/stand/common/reloc_elf.c b/stand/common/reloc_elf.c
index f8417aeeb64a..56b661dc21bd 100644
--- a/stand/common/reloc_elf.c
+++ b/stand/common/reloc_elf.c
@@ -175,8 +175,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;
@@ -188,8 +187,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)
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
