From: Alexandre Oliva Date: Tue, 22 Oct 2002 22:17:11 +0000 (+0000) Subject: * elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Don't move X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3eccbd8c9df1fc4b25ad9ce5c96be85319f6dd3b;p=pf3gnuchains%2Fpf3gnuchains3x.git * elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Don't move the options section into a separate section unless IRIX 6 compatibility is enabled. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f00325e12d..08efbe2f86 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,11 @@ 2002-10-22 Alexandre Oliva + * elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Don't move + the options section into a separate section unless IRIX 6 + compatibility is enabled. + +2002-10-22 Alexandre Oliva + * elflink.h (struct elf_link_sort_rela): Turn rel and rela into arrays. (elf_link_sort_cmp1, elf_link_sort_cmp2): Adjust. diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index ec0b54b001..bc81458987 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -6137,7 +6137,12 @@ _bfd_mips_elf_modify_segment_map (abfd) .dynamic end up in PT_DYNAMIC. However, we do have to insert a PT_OPTIONS segment immediately following the program header table. */ - if (NEWABI_P (abfd)) + if (NEWABI_P (abfd) + /* On non-IRIX6 new abi, we'll have already created a segment + for this section, so don't create another. I'm not sure this + is not also the case for IRIX 6, but I can't test it right + now. */ + && IRIX_COMPAT (abfd) == ict_irix6) { for (s = abfd->sections; s; s = s->next) if (elf_section_data (s)->this_hdr.sh_type == SHT_MIPS_OPTIONS)