From owner-svn-src-all@FreeBSD.ORG  Mon Jun 11 15:40:58 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 28B061065673;
	Mon, 11 Jun 2012 15:40:58 +0000 (UTC)
	(envelope-from theraven@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EDA538FC08;
	Mon, 11 Jun 2012 15:40:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5BFevQ8092572;
	Mon, 11 Jun 2012 15:40:57 GMT
	(envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5BFevq4092569;
	Mon, 11 Jun 2012 15:40:57 GMT
	(envelope-from theraven@svn.freebsd.org)
Message-Id: <201206111540.q5BFevq4092569@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Mon, 11 Jun 2012 15:40:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236890 - in head: gnu/lib/libsupc++ lib/libcxxrt
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jun 2012 15:40:58 -0000

Author: theraven
Date: Mon Jun 11 15:40:57 2012
New Revision: 236890
URL: http://svn.freebsd.org/changeset/base/236890

Log:
  Clean up some symbol versions for libsupc++ / libcxxrt.
  
  MFC after:	1 week
  Reviewed by:	kan

Modified:
  head/gnu/lib/libsupc++/Version.map
  head/lib/libcxxrt/Version.map

Modified: head/gnu/lib/libsupc++/Version.map
==============================================================================
--- head/gnu/lib/libsupc++/Version.map	Mon Jun 11 14:02:02 2012	(r236889)
+++ head/gnu/lib/libsupc++/Version.map	Mon Jun 11 15:40:57 2012	(r236890)
@@ -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 {

Modified: head/lib/libcxxrt/Version.map
==============================================================================
--- head/lib/libcxxrt/Version.map	Mon Jun 11 14:02:02 2012	(r236889)
+++ head/lib/libcxxrt/Version.map	Mon Jun 11 15:40:57 2012	(r236890)
@@ -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&)";
+    };
+};