From 5db3e65d39c4018e88c3e7bba089fa9df11e7617 Mon Sep 17 00:00:00 2001 From: Jack Carter Date: Tue, 18 Feb 2014 16:23:48 -0800 Subject: [PATCH] The PT_DYNAMIC segment was being hard coded to have read, write, and execute permission regardless of the underlying PT_LOAD segment permissions. Deleting this code allows the default linker behavior which is to set the dynamic segment to the same permissions as the sections that make it up. This change alters one existing test case to check the segment flags for PT_DYNAMIC. bfd/ChangeLog * elfxx-mips.c(_bfd_mips_elf_modify_segment_map): Deleted hard coding of PT_DYNAMIC segment flags. ld/testsuite/ChangeLog * ld-mips-elf/pic-and-nonpic-3a.sd: Check DYNAMIC segment flags. --- bfd/ChangeLog | 5 +++++ bfd/elfxx-mips.c | 12 ------------ ld/testsuite/ChangeLog | 4 ++++ ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index eaf7d32..88e042e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2014-02-18 Jack Carter + + * elfxx-mips.c(_bfd_mips_elf_modify_segment_map): Deleted hard coding of + PT_DYNAMIC segment flags. + 2014-02-17 Jan Kratochvil PR binutils/16595 diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index f51845b..9011b6d 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -11919,18 +11919,6 @@ _bfd_mips_elf_modify_segment_map (bfd *abfd, if ((*pm)->p_type == PT_DYNAMIC) break; m = *pm; - if (m != NULL && IRIX_COMPAT (abfd) == ict_none) - { - /* For a normal mips executable the permissions for the PT_DYNAMIC - segment are read, write and execute. We do that here since - the code in elf.c sets only the read permission. This matters - sometimes for the dynamic linker. */ - if (bfd_get_section_by_name (abfd, ".dynamic") != NULL) - { - m->p_flags = PF_R | PF_W | PF_X; - m->p_flags_valid = 1; - } - } /* GNU/Linux binaries do not need the extended PT_DYNAMIC section. glibc's dynamic linker has traditionally derived the number of tags from the p_filesz field, and sometimes allocates stack diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 337cbf0..4b37b0d 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2014-02-18 Jack Carter + + * ld-mips-elf/pic-and-nonpic-3a.sd: Check DYNAMIC segment flags. + 2014-02-16 Thomas Schwinge * ld-elfweak/elfweak.exp (setup_xfail_gnu_hurd): Remove function diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd index 58b50c3..b178bdf 100644 --- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd +++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.sd @@ -8,7 +8,7 @@ Program Headers: * REGINFO * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R * 0x.* * LOAD * [^ ]+ * 0x0+00000 * 0x0+00000 [^ ]+ * [^ ]+ * R E * 0x.* * LOAD * [^ ]+ * 0x0+10000 * 0x0+10000 [^ ]+ * [^ ]+ * RW * 0x.* - * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 .* + * DYNAMIC * [^ ]+ * 0x0+00400 * 0x0+00400 [^ ]+ * [^ ]+ * R * 0x.* * NULL * .* *Section to Segment mapping: -- 2.7.4