From: GNU Libc Maintainers Date: Wed, 16 Dec 2020 21:33:25 +0000 (+0000) Subject: local-reloc X-Git-Tag: archive/raspbian/2.31-6+rpi1^2~36 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=90c603b7d45c9907d5a393f18667b0d2e4273c47;p=glibc.git local-reloc # DP: Description: binutils bug workaround # DP: Related bugs: #263601: m68k: workaround for binutils problem # DP: Dpatch author: Roman Zippel # DP: Patch author: Richard Zidlicky # DP: Upstream status: Debian-Specific # DP: Status Details: Actual fix is to modify m68k binutils. # DP: Date: 2004-08-09 # DP: Description: binutils bug workaround # DP: Related bugs: #263601: m68k: workaround for binutils problem # DP: Dpatch author: Roman Zippel # DP: Patch author: Richard Zidlicky # DP: Upstream status: Debian-Specific # DP: Status Details: Actual fix is to modify m68k binutils. # DP: Date: 2004-08-09 Gbp-Pq: Topic m68k Gbp-Pq: Name local-reloc.diff --- diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index 4a8c65476..ee705625f 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -319,6 +319,8 @@ elf_machine_lazy_rel (struct link_map *map, Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset); if (ELF32_R_TYPE (reloc->r_info) == R_68K_JMP_SLOT) *reloc_addr += l_addr; + else if (ELF32_R_TYPE (reloc->r_info) == R_68K_NONE) + return; else _dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 1); }