aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2002-10-22 22:17:11 +0000
committerAlexandre Oliva <aoliva@redhat.com>2002-10-22 22:17:11 +0000
commitc1fd659837e15e4fd23fe91d8a69fcd64b32e9c1 (patch)
tree9e55297e843a0db686d0e283e86526b71546d132 /bfd
parent3ffe58d945bfbafd5162eab54e101681854b9882 (diff)
downloadgdb-c1fd659837e15e4fd23fe91d8a69fcd64b32e9c1.zip
gdb-c1fd659837e15e4fd23fe91d8a69fcd64b32e9c1.tar.gz
gdb-c1fd659837e15e4fd23fe91d8a69fcd64b32e9c1.tar.bz2
* 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.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elfxx-mips.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f00325e..08efbe2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
2002-10-22 Alexandre Oliva <aoliva@redhat.com>
+ * 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 <aoliva@redhat.com>
+
* 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 ec0b54b..bc81458 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)