Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Unified Diff: binutils/bfd/elf32-cris.c

Issue 3018030: [binutils] Bump binutils to 2.20.1 (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/nacl-toolchain.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « binutils/bfd/elf32-arm.c ('k') | binutils/bfd/elf32-ppc.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: binutils/bfd/elf32-cris.c
diff --git a/binutils/bfd/elf32-cris.c b/binutils/bfd/elf32-cris.c
index 2037b10f59ec6f82e628fe3c09532fcc45cb3f76..ceea1b92736ff4972816242a911b018ce3bd75f7 100644
--- a/binutils/bfd/elf32-cris.c
+++ b/binutils/bfd/elf32-cris.c
@@ -1690,15 +1690,10 @@ cris_elf_relocate_section (output_bfd, info, input_bfd, input_section,
= -elf_cris_hash_table (info)->dtpmod_refcount;
}
- /* The thread-based offset to the local symbol is the
- 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. */
+ /* The relocation is the offset from the start of the module
+ TLS block to the (local) symbol. */
relocation -= elf_hash_table (info)->tls_sec == NULL
- ? 0 : (elf_hash_table (info)->tls_sec->vma
- + (info->shared
- ? 0 : elf_hash_table (info)->tls_size));
+ ? 0 : elf_hash_table (info)->tls_sec->vma;
break;
case R_CRIS_32_GD:
« no previous file with comments | « binutils/bfd/elf32-arm.c ('k') | binutils/bfd/elf32-ppc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698