diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a92ebe894b..88030e7438 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 e0d7fff451..84299ceb9e 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 27354dfa94..1f490d41cb 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 b05b8d7e80..c3ad1abc05 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+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
diff --git a/ld/testsuite/ld-i386/dummy.s b/ld/testsuite/ld-i386/dummy.s
deleted file mode 100644
index 403f98000d..0000000000
--- 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 982e09f50f..47f918fa18 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 388fd56de4..0000000000
--- 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 137c61f26f..0000000000
--- 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 42203bb2fd..7d2934f9b5 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