From 1fbc4a84a3764dd04760128c5666348c0fa070eb Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 7 Dec 2001 11:14:12 +0000 Subject: [PATCH] * elf32-sparc.c (elf32_sparc_relocate_section): Revert 2001-09-14 change. --- bfd/ChangeLog | 5 +++++ bfd/elf32-sparc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a87aa9f..e313bb3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2001-12-07 Jakub Jelinek + * elf32-sparc.c (elf32_sparc_relocate_section): Revert + 2001-09-14 change. + +2001-12-07 Jakub Jelinek + * elf.c (_bfd_elf_rela_local_sym): Only call _bfd_merged_section_offset if merge_info is non-NULL. (_bfd_elf_rel_local_sym, _bfd_elf_section_offset): New. diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index 6a82d72..d540efe 100644 --- a/bfd/elf32-sparc.c +++ b/bfd/elf32-sparc.c @@ -1493,7 +1493,7 @@ elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section, } else { - if (r_type == R_SPARC_32 || r_type == R_SPARC_UA32) + if (r_type == R_SPARC_32) { outrel.r_info = ELF32_R_INFO (0, R_SPARC_RELATIVE); outrel.r_addend = relocation + rel->r_addend; -- 2.7.4