diff options
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 3 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 3 | ||||
| -rw-r--r-- | ld/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/dummy.s | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/i386.exp | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/pr13909.d | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr13909.d | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/x86-64.exp | 1 |
9 files changed, 19 insertions, 27 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a92ebe8..88030e7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2012-05-22 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/13909 + * elf32-i386.c (elf_i386_create_dynamic_sections): Revert the + last change. + * elf64-x86-64.c (elf_x86_64_create_dynamic_sections): Likewise. + 2012-05-22 Alan Modra <amodra@gmail.com> * elflink.c (bfd_elf_discard_info): Look for next .eh_frame if diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index e0d7fff..84299ce 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -1016,8 +1016,7 @@ elf_i386_create_dynamic_sections (bfd *dynobj, struct bfd_link_info *info) if (!info->no_ld_generated_unwind_info && htab->plt_eh_frame == NULL - && htab->elf.splt != NULL - && bfd_get_section_by_name (dynobj, ".eh_frame") != NULL) + && htab->elf.splt != NULL) { flagword flags = get_elf_backend_data (dynobj)->dynamic_sec_flags; htab->plt_eh_frame diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 27354df..1f490d4 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -980,8 +980,7 @@ elf_x86_64_create_dynamic_sections (bfd *dynobj, if (!info->no_ld_generated_unwind_info && htab->plt_eh_frame == NULL - && htab->elf.splt != NULL - && bfd_get_section_by_name (dynobj, ".eh_frame") != NULL) + && htab->elf.splt != NULL) { const struct elf_x86_64_backend_data *const abed = get_elf_x86_64_backend_data (dynobj); diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index b05b8d7..c3ad1ab 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,6 +1,16 @@ 2012-05-22 H.J. Lu <hongjiu.lu@intel.com> PR ld/13909 + * ld-i386/i386.exp: Revert the last change. + * ld-x86-64/x86-64.exp: Likewise. + + * ld-i386/dummy.s: Removed. + * ld-i386/pr13909.d: Likewise. + * ld-x86-64/pr13909.d: Likewise. + +2012-05-22 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/13909 * ld-i386/i386.exp: Run pr13909. * ld-x86-64/x86-64.exp: Likewise. diff --git a/ld/testsuite/ld-i386/dummy.s b/ld/testsuite/ld-i386/dummy.s deleted file mode 100644 index 403f980..0000000 --- a/ld/testsuite/ld-i386/dummy.s +++ /dev/null @@ -1 +0,0 @@ -# Dummy diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 982e09f..47f918f 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -233,7 +233,6 @@ run_dump_test "pr12718" run_dump_test "pr12921" run_dump_test "pr12570a" run_dump_test "pr12570b" -run_dump_test "pr13909" if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/pr13909.d b/ld/testsuite/ld-i386/pr13909.d deleted file mode 100644 index 388fd56..0000000 --- a/ld/testsuite/ld-i386/pr13909.d +++ /dev/null @@ -1,10 +0,0 @@ -#name: PR ld/13909 -#source: dummy.s -#as: --32 -#ld: -melf_i386 -shared -#readelf: -S --wide - -#failif -#... - +\[ [0-9]\] .eh_frame +PROGBITS +[0-9a-f]+ +[0-9a-f]+ 0+ +.* -#... diff --git a/ld/testsuite/ld-x86-64/pr13909.d b/ld/testsuite/ld-x86-64/pr13909.d deleted file mode 100644 index 137c61f..0000000 --- a/ld/testsuite/ld-x86-64/pr13909.d +++ /dev/null @@ -1,10 +0,0 @@ -#name: PR ld/13909 -#source: dummy.s -#as: --64 -#ld: -melf_x86_64 -shared -#readelf: -S --wide - -#failif -#... - +\[ [0-9]\] .eh_frame +PROGBITS +[0-9a-f]+ +[0-9a-f]+ 0+ +.* -#... diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 42203bb..7d2934f 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -208,7 +208,6 @@ run_dump_test "pr12921" run_dump_test "pr13947" run_dump_test "pr12570a" run_dump_test "pr12570b" -run_dump_test "pr13909" if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { return |