[src/trunk]: src/libexec/ld.elf_so/arch/hppa Use the tlsoffset from the corre...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2a9d20da61da
branches:  trunk
changeset: 771861:2a9d20da61da
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Dec 04 16:53:08 2011 +0000

description:
Use the tlsoffset from the correct object.

diffstat:

 libexec/ld.elf_so/arch/hppa/hppa_reloc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r df93ff8faac4 -r 2a9d20da61da libexec/ld.elf_so/arch/hppa/hppa_reloc.c
--- a/libexec/ld.elf_so/arch/hppa/hppa_reloc.c  Sun Dec 04 16:24:13 2011 +0000
+++ b/libexec/ld.elf_so/arch/hppa/hppa_reloc.c  Sun Dec 04 16:53:08 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hppa_reloc.c,v 1.40 2011/09/25 13:34:54 chs Exp $      */
+/*     $NetBSD: hppa_reloc.c,v 1.41 2011/12/04 16:53:08 skrll Exp $    */
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hppa_reloc.c,v 1.40 2011/09/25 13:34:54 chs Exp $");
+__RCSID("$NetBSD: hppa_reloc.c,v 1.41 2011/12/04 16:53:08 skrll Exp $");
 #endif /* not lint */
 
 #include <stdlib.h>
@@ -481,7 +481,7 @@
                        if (!defobj->tls_done && _rtld_tls_offset_allocate(obj))
                                return -1;
 
-                       *where = (Elf_Addr)(obj->tlsoffset + def->st_value +
+                       *where = (Elf_Addr)(defobj->tlsoffset + def->st_value +
                            rela->r_addend + sizeof(struct tls_tcb));
 
                        rdbg(("TPREL32 %s in %s --> %p in %s",