aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2009-03-24 03:32:31 +0000
committerHans-Peter Nilsson <hp@axis.com>2009-03-24 03:32:31 +0000
commit019c5a2e3fc8afe601a2e40c470e90ae0b03edf6 (patch)
treedab11e9b394d1c7df8ec3b6eed649965cd1bc568 /bfd
parent6cdd57f45ddc8636b0cb899448bf62aaf467e97c (diff)
downloadgdb-019c5a2e3fc8afe601a2e40c470e90ae0b03edf6.zip
gdb-019c5a2e3fc8afe601a2e40c470e90ae0b03edf6.tar.gz
gdb-019c5a2e3fc8afe601a2e40c470e90ae0b03edf6.tar.bz2
* elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_GD>
<R_CRIS_16_GOT_GD, R_CRIS_32_GOT_GD>: Don't include the TLS size when emitting a known TP offset in the GOT.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-cris.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9dfb87e..8336ac4 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-24 Hans-Peter Nilsson <hp@axis.com>
+
+ * elf32-cris.c (cris_elf_relocate_section) <case R_CRIS_32_GD>
+ <R_CRIS_16_GOT_GD, R_CRIS_32_GOT_GD>: Don't include the TLS size
+ when emitting a known TP offset in the GOT.
+
2009-03-23 Alan Modra <amodra@bigpond.net.au>
* elf64-ppc.c (synthetic_opd): Delete.
diff --git a/bfd/elf32-cris.c b/bfd/elf32-cris.c
index bd6de29..6dc669a 100644
--- a/bfd/elf32-cris.c
+++ b/bfd/elf32-cris.c
@@ -1735,9 +1735,8 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
bfd_vma off;
/* The symbol is defined in the program, so just write
- (1, -prog_tls_size+known_tpoffset) into the GOT. */
+ (1, known_tpoffset) into the GOT. */
relocation -= elf_hash_table (info)->tls_sec->vma;
- relocation -= elf_hash_table (info)->tls_size;
if (h != NULL)
{