2 files changed, 23 insertions, 19 deletions

diff --git a/gnu/lib/libsupc++/Version.map b/gnu/lib/libsupc++/Version.map
index 3d9cdf2634e0..ec6303ef78ec 100644
--- a/gnu/lib/libsupc++/Version.map
+++ b/gnu/lib/libsupc++/Version.map
@@ -126,26 +126,22 @@ CXXABI_1.3 {
     # __gnu_cxx::_verbose_terminate_handler()
     _ZN9__gnu_cxx27__verbose_terminate_handlerEv;
 
-    # operator new and new[], 32-bit size_t
-    _Znaj;
-    _ZnajRKSt9nothrow_t;
-    _Znwj;
-    _ZnwjRKSt9nothrow_t;
-
-    # operator new and new[], 64-bit size_t
-    _Znam;
-    _ZnamRKSt9nothrow_t;
-    _Znwm;
-    _ZnwmRKSt9nothrow_t;
+  local:
+    *;
+};
+
+GLIBCXX_3.4 {
+    # operator new and new[]
+    _Znai[jm];
+    _Zna[jm]RKSt9nothrow_t;
+    _Znw[jm];
+    _Znw[jm]RKSt9nothrow_t;
 
     # operator delete and delete[]
     _ZdaPv;
     _ZdaPvRKSt9nothrow_t;
     _ZdlPv;
     _ZdlPvRKSt9nothrow_t;
-
-  local:
-    *;
 };
 
 CXXABI_1.3.1 {
diff --git a/lib/libcxxrt/Version.map b/lib/libcxxrt/Version.map
index b5be60e5ac21..ca990a0dddea 100644
--- a/lib/libcxxrt/Version.map
+++ b/lib/libcxxrt/Version.map
@@ -306,11 +306,6 @@ CXXRT_1.0 {
         "std::type_info::__is_pointer_p() const";
 
 
-        "operator delete[](void*)";
-        "operator delete(void*)";
-        "operator new[](unsigned long)";
-        "operator new(unsigned long)";
-        "operator new(unsigned long, std::nothrow_t const&)";
 
     };
     __cxa_allocate_dependent_exception;
@@ -321,3 +316,16 @@ CXXRT_1.0 {
     __cxa_rethrow_primary_exception;
 
 } CXXABI_1.3.1;
+
+GLIBCXX_3.4 {
+    extern "C++" {
+        "operator delete[](void*)";
+        "operator delete(void*)";
+        "operator new[](unsigned int)";
+        "operator new(unsigned int)";
+        "operator new(unsigned int, std::nothrow_t const&)";
+        "operator new[](unsigned long)";
+        "operator new(unsigned long)";
+        "operator new(unsigned long, std::nothrow_t const&)";
+    };
+};