From: David O'Brien Date: Thu, 14 Nov 2002 16:23:07 +0000 (+0000) Subject: 2002-11-14 David O'Brien X-Git-Tag: binutils-2_13_2~67 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efedcadff22d1439c1d13516796621d78af60da8;p=thirdparty%2Fbinutils-gdb.git 2002-11-14 David O'Brien Merge from mainline: 2002-11-12 Thomas Moestl * elf64-sparc.c (sparc64_elf_adjust_dynamic_symbol): Correct references to large plt symbols. Approved by: Daniel Jacobowitz Message-ID: <20021114003410.GA15753@nevyn.them.org> --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c263c9df6a5..21a4ef9c7c8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2002-11-14 David O'Brien + + Merge from mainline: + 2002-11-12 Thomas Moestl + * elf64-sparc.c (sparc64_elf_adjust_dynamic_symbol): Correct + references to large plt symbols. + 2002-11-13 Alan Modra Merge from mainline. diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index 1ca03dcb854..88d02544c1c 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -1563,6 +1563,9 @@ sparc64_elf_adjust_dynamic_symbol (info, h) if (s->_raw_size == 0) s->_raw_size = PLT_HEADER_SIZE; + /* To simplify matters later, just store the plt index here. */ + h->plt.offset = s->_raw_size / PLT_ENTRY_SIZE; + /* If this symbol is not defined in a regular file, and we are not generating a shared library, then set the symbol to this location in the .plt. This is required to make function @@ -1572,12 +1575,9 @@ sparc64_elf_adjust_dynamic_symbol (info, h) && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0) { h->root.u.def.section = s; - h->root.u.def.value = s->_raw_size; + h->root.u.def.value = sparc64_elf_plt_entry_offset (h->plt.offset); } - /* To simplify matters later, just store the plt index here. */ - h->plt.offset = s->_raw_size / PLT_ENTRY_SIZE; - /* Make room for this entry. */ s->_raw_size += PLT_ENTRY_SIZE;