From 7160c10d6530b79ea45d435933b07765f610f54d Mon Sep 17 00:00:00 2001 From: James Clarke Date: Tue, 28 Jun 2016 12:00:56 +0100 Subject: Don't convert R_SPARC_32 to R_SPARC_RELATIVE if class is ELFCLASS64. bfd * elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Don't convert R_SPARC_32 to R_SPARC_RELATIVE if class is ELFCLASS64. gold * sparc.cc (Target_sparc::Scan::local): Don't convert R_SPARC_32 to R_SPARC_RELATIVE if class is ELFCLASS64. (Target_sparc::Scan::global): Likewise. ld * testsuite/ld-elf/symbolic-func.r: Allow non-zero offsets from .text. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-sparc.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e6ed960..52b26fc 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-06-28 James Clarke + + * elfxx-sparc.c (_bfd_sparc_elf_relocate_section): Don't convert + R_SPARC_32 to R_SPARC_RELATIVE if class is ELFCLASS64. + 2016-06-28 Maciej W. Rozycki * elf32-mips.c (elf_mips16_howto_table_rel): Add diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index 3c47255..63558c7 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -3481,7 +3481,8 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd, } else { - if (r_type == R_SPARC_32 || r_type == R_SPARC_64) + if ( (!ABI_64_P (output_bfd) && r_type == R_SPARC_32) + || (ABI_64_P (output_bfd) && r_type == R_SPARC_64)) { outrel.r_info = SPARC_ELF_R_INFO (htab, NULL, 0, R_SPARC_RELATIVE); -- cgit v1.1