[PATCH] ld: Allow R_386_GOT32 for call *__tls_get_addr@GOT(%reg)

Fangrui Song maskray@google.com
Thu Jan 5 23:07:42 GMT 2023


Similar to
https://sourceware.org/pipermail/binutils/2023-January/125506.html (x86_64).

_Thread_local int a;
int main() { return a; }

% gcc -m32 -fno-plt -fpic a.c -fuse-ld=bfd -Wa,-mrelax-relocations=no
/usr/bin/ld.bfd: /tmp/ccR8Yexy.o: TLS transition from R_386_TLS_GD to R_386_TLS_IE_32 against `a' at 0x15 in section `.text' failed
/usr/bin/ld.bfd: failed to set dynamic section sizes: bad value
collect2: error: ld returned 1 exit status

This commit fixes the issue.

    PR ld/24784
    * bfd/elf32-i386.c (elf_i386_check_tls_transition): Allow R_386_GOT32.
---
 bfd/elf32-i386.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 9e398eacb81..f0de1c62a5e 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -963,7 +963,8 @@ elf_i386_check_tls_transition (asection *sec,
 	  || !((struct elf_x86_link_hash_entry *) h)->tls_get_addr)
 	return false;
       else if (indirect_call)
-	return (ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32X);
+	return (ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32X
+		|| ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32);
       else
 	return (ELF32_R_TYPE (rel[1].r_info) == R_386_PC32
 		|| ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32);
-- 
2.39.0.314.g84b9a713c41-goog



More information about the Binutils mailing list