diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 6ef5919804..e2997b06e9 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-elf/elf.exp (array_tests): Remove "pr12730".
+	(array_tests_pie): Remove "PIE pr12730".
+	(array_tests_static): Remove "static pr12730".
+
+	* ld-elf/pr12730.cc: Removed.
+	* ld-elf/pr12730.out: Likewise.
+
 2011-05-09  Paul Brook  <paul@codesourcery.com>
 
 	* ld-tic6x/discard-unwind.ld: New.
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 6808d8a006..b9ff0bd019 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -81,21 +81,18 @@ set array_tests {
     {"init array" "" "" {init.c} "init" "init.out"}
     {"fini array" "" "" {fini.c} "fini" "fini.out"}
     {"init array mixed" "" "" {init-mixed.c} "init-mixed" "init-mixed.out" "-I."}
-    {"pr12730" "" "" {pr12730.cc} "pr12730" "pr12730.out" "" "c++"}
 }
 set array_tests_pie {
     {"PIE preinit array" "-pie" "" {preinit.c} "preinit" "preinit.out" "-fPIE" }
     {"PIE init array" "-pie" "" {init.c} "init" "init.out" "-fPIE"}
     {"PIE fini array" "-pie" "" {fini.c} "fini" "fini.out" "-fPIE"}
     {"PIE init array mixed" "-pie" "" {init-mixed.c} "init-mixed" "init-mixed.out" "-I. -fPIE"}
-    {"PIE pr12730" "-pie" "" {pr12730.cc} "pr12730" "pr12730.out" "-fPIE" "c++"}
 }
 set array_tests_static {
     {"static preinit array" "-static" "" {preinit.c} "preinit" "preinit.out"}
     {"static init array" "-static" "" {init.c} "init" "init.out"}
     {"static fini array" "-static" "" {fini.c} "fini" "fini.out"}
     {"static init array mixed" "-static" "" {init-mixed.c} "init-mixed" "init-mixed.out" "-I."}
-    {"static pr12730" "-static" "" {pr12730.cc} "pr12730" "pr12730.out" "" "c++"}
 }
 
 # NetBSD ELF systems do not currently support the .*_array sections.
diff --git a/ld/testsuite/ld-elf/pr12730.cc b/ld/testsuite/ld-elf/pr12730.cc
deleted file mode 100644
index 69f57f93fd..0000000000
--- a/ld/testsuite/ld-elf/pr12730.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <iostream>
-
-class Hello
-{
-public:
-   Hello ()
-    {}
-
-  ~Hello ()
-    {}
-
-  void act ()
-    { std::cout << "Hello, world!" << std::endl; }
-};
-
-
-template <class T>
-struct Foo
-{
-  T* _M_allocate_single_object ()
-    {
-      return new T;
-    }
-};
-
-static void __attribute__ (( constructor )) PWLIB_StaticLoader() {
-  Foo<Hello> allocator;
-  Hello* salut = allocator._M_allocate_single_object ();
-  salut->act ();
-}
-
-
-int
-main (int /*argc*/,
-      char* /*argv*/[])
-{
-  return 0;
-}
diff --git a/ld/testsuite/ld-elf/pr12730.out b/ld/testsuite/ld-elf/pr12730.out
deleted file mode 100644
index af5626b4a1..0000000000
--- a/ld/testsuite/ld-elf/pr12730.out
+++ /dev/null
@@ -1 +0,0 @@
-Hello, world!