Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so/arch/powerpc Fix copy & pasto: DTPREL relo...



details:   https://anonhg.NetBSD.org/src/rev/700ebaf3f410
branches:  trunk
changeset: 368360:700ebaf3f410
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jul 06 17:35:20 2022 +0000

description:
Fix copy & pasto: DTPREL relocations do not need to allocate a static
TLS index. Patch from joerg@

diffstat:

 libexec/ld.elf_so/arch/powerpc/ppc_reloc.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r f08530ab0763 -r 700ebaf3f410 libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
--- a/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c        Wed Jul 06 15:41:47 2022 +0000
+++ b/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c        Wed Jul 06 17:35:20 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ppc_reloc.c,v 1.61 2020/05/24 02:33:11 macallan Exp $  */
+/*     $NetBSD: ppc_reloc.c,v 1.62 2022/07/06 17:35:20 martin Exp $    */
 
 /*-
  * Copyright (C) 1998  Tsubai Masanari
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ppc_reloc.c,v 1.61 2020/05/24 02:33:11 macallan Exp $");
+__RCSID("$NetBSD: ppc_reloc.c,v 1.62 2022/07/06 17:35:20 martin Exp $");
 #endif /* not lint */
 
 #include <stdarg.h>
@@ -313,9 +313,6 @@
                        break;
 
                case R_TYPE(DTPREL):
-                       if (!defobj->tls_done && _rtld_tls_offset_allocate(obj))
-                               return -1;
-
                        *where = (Elf_Addr)(def->st_value + rela->r_addend
                            - TLS_DTV_OFFSET);
                        rdbg(("DTPREL32 %s in %s --> %p in %s",



Home | Main Index | Thread Index | Old Index