diff options
| author | H.J. Lu <hjl@lucon.org> | 2008-07-21 14:36:07 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@lucon.org> | 2008-07-21 14:36:07 +0000 |
| commit | 0d3b0df8b1d60a011a13168b6a6d1af73a90d1a6 (patch) | |
| tree | 2ed0fe5d8d0b4c8b22e11e2415cc2dbbe79b0283 | |
| parent | 0e56007c7bee1680269f576a8afe9de588696dcd (diff) | |
| download | gdb-0d3b0df8b1d60a011a13168b6a6d1af73a90d1a6.tar.gz | |
2008-07-21 H.J. Lu <hongjiu.lu@intel.com>
PR ld/6747
* elf32-frv.c (elf32_frv_relocate_section): Revert the change
for PR ld/6446 checked in by accident on May 21, 2008.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-frv.c | 11 |
2 files changed, 7 insertions, 10 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2e677da81e0..c2e14fb9217 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2008-07-21 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/6747 + * elf32-frv.c (elf32_frv_relocate_section): Revert the change + for PR ld/6446 checked in by accident on May 21, 2008. + 2008-07-21 Nick Clifton <nickc@redhat.com> * coff-sh.c (bfd_pe_print_pdata): Define to NULL for non diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index fab71ad90e4..aad8253bbc1 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -2728,14 +2728,7 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section, check_segment[2]; int silence_segment_error = !(info->shared || info->pie); unsigned long insn; - static bfd_boolean ef_frv_pic_flag_set = FALSE; - if (! ef_frv_pic_flag_set && IS_FDPIC (output_bfd)) - { - elf_elfheader (output_bfd)->e_flags |= EF_FRV_PIC; - ef_frv_pic_flag_set = TRUE; - } - symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr; sym_hashes = elf_sym_hashes (input_bfd); relend = relocs + input_section->reloc_count; @@ -3992,9 +3985,7 @@ elf32_frv_relocate_section (output_bfd, info, input_bfd, input_section, } if (!silence_segment_error && (info->shared || info->pie)) return FALSE; - /* PR 6446: EF_FRV_PIC should be cleared if - there are any inter-segment relocations. */ - elf_elfheader (output_bfd)->e_flags &= ~ EF_FRV_PIC; + elf_elfheader (output_bfd)->e_flags |= EF_FRV_PIC; } switch (r_type) |