From f551b6f0cec18b7c84533d3fa9c09458d05f28d4 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Tue, 27 Jan 2009 07:06:36 +0000 Subject: [PATCH] * elf32-cris.c (cris_elf_relocate_section) : Correct relocation value. --- bfd/ChangeLog | 3 +++ bfd/elf32-cris.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 99618693fd9..41cee38341b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,8 @@ 2009-01-27 Hans-Peter Nilsson + * elf32-cris.c (cris_elf_relocate_section) + : Correct relocation value. + * elf32-cris.c (cris_elf_relocate_section) : Don't call BFD_ASSERT for weak undefined symbols with non-default visibility. diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c index 6b71ee47b9c..16b0b453d16 100644 --- a/bfd/elf32-cris.c +++ b/bfd/elf32-cris.c @@ -1687,9 +1687,14 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section, } /* The thread-based offset to the local symbol is the - relocation. */ + relocation. + For the executable, TLS data begins at the thread pointer plus + the negative size of the TLS data. For a DSO, that's part of + the module TLS offset. */ relocation -= elf_hash_table (info)->tls_sec == NULL - ? 0 : elf_hash_table (info)->tls_sec->vma; + ? 0 : (elf_hash_table (info)->tls_sec->vma + + (info->shared + ? 0 : elf_hash_table (info)->tls_sec->size)); break; case R_CRIS_32_GD: -- 2.30.2