From ee09c3e30c5074bb88a79fa7de07eaf0adb028d0 Mon Sep 17 00:00:00 2001 From: kib Date: Mon, 10 Oct 2011 14:48:18 +0000 Subject: [PATCH] MFC r226156: Handle the R_386_TLS_TPOFF32 relocation. Approved by: re (bz) git-svn-id: svn://svn.freebsd.org/base/stable/9@226215 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- libexec/rtld-elf/i386/reloc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c index 9efebb32c..c9a6e53ee 100644 --- a/libexec/rtld-elf/i386/reloc.c +++ b/libexec/rtld-elf/i386/reloc.c @@ -213,9 +213,11 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, RtldLockState *lockstate) break; case R_386_TLS_TPOFF: + case R_386_TLS_TPOFF32: { const Elf_Sym *def; const Obj_Entry *defobj; + Elf_Addr add; def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, false, cache, lockstate); @@ -237,8 +239,11 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, RtldLockState *lockstate) goto done; } } - - *where += (Elf_Addr) (def->st_value - defobj->tlsoffset); + add = (Elf_Addr) (def->st_value - defobj->tlsoffset); + if (ELF_R_TYPE(rel->r_info) == R_386_TLS_TPOFF) + *where += add; + else + *where -= add; } break; -- 2.45.0