diff options
-rw-r--r-- | bfd/ChangeLog | 5 | ||||
-rw-r--r-- | bfd/elfxx-sparc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 876de33..6085db8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2014-08-05 Alan Modra <amodra@gmail.com> + PR ld/17226 + * elfxx-sparc.c (_bfd_sparc_elf_gc_sweep_hook): Typo fix. + +2014-08-05 Alan Modra <amodra@gmail.com> + * linker.c (generic_link_check_archive_element): Move handling of command link -u symbols with a common symbol def to the code handling non-common symbols so that archive element symbols diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index e8ebcb3..2a5eb01 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -1970,7 +1970,7 @@ _bfd_sparc_elf_gc_sweep_hook (bfd *abfd, struct bfd_link_info *info, } r_type = SPARC_ELF_R_TYPE (rel->r_info); - r_type = sparc_elf_tls_transition (info, abfd, r_type, h != NULL); + r_type = sparc_elf_tls_transition (info, abfd, r_type, h == NULL); switch (r_type) { case R_SPARC_TLS_LDM_HI22: |