re PR libstdc++/50349 (/usr/bin/ld: warning: wildcard match appears in both version...

2012-02-17  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/50349
	* config/abi/pre/gnu.ver: Only one local.
	* config/abi/pre/gnu-versioned-namespace.ver: Same.

From-SVN: r184453

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 366d219f1e636cde9aa54fdc138c929099404ee0..eee0392bd9620f0dca86da608df1de896f1ed47b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-17  Benjamin Kosnik  <bkoz@redhat.com>
+
+       PR libstdc++/50349
+       * config/abi/pre/gnu.ver: Only one local.
+       * config/abi/pre/gnu-versioned-namespace.ver: Same.
+
 2012-02-21  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/52317 (cont)

diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
index 2bd23cd1bea76ccc4e7703ed805b1dc0bc90317f..e7e916247591fa683d74771ec52186e9acf5f226 100644 (file)
--- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
+++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver
@@ -312,15 +312,12 @@ CXXABI_2.0 {
     _ZTVN10__cxxabiv120__si_class_type_infoE;
     _ZTVN10__cxxabiv121__vmi_class_type_infoE;
 
-  local:
-    *;
 };
 
 # Symbols in the support library (libsupc++) supporting trans-mem.
 CXXABI_TM_1 {
+
   global:
     __cxa_tm_cleanup;
 
-  local:
-    *;
 };

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index 41d38a7a3763a2179d107db9a80512d73c9da168..9657024e3f045bb6204a5dfd78ff6a5f1a37589f 100644 (file)
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1421,8 +1421,6 @@ CXXABI_1.3 {
     # __gnu_cxx::_verbose_terminate_handler()
     _ZN9__gnu_cxx27__verbose_terminate_handlerEv;
 
-  local:
-    *;
 };
 
 CXXABI_1.3.1 {
@@ -1471,15 +1469,6 @@ CXXABI_1.3.3 {
 
 } CXXABI_1.3.2;
 
-# Symbols in the support library (libsupc++) supporting trans-mem.
-CXXABI_TM_1 {
-  global:
-    __cxa_tm_cleanup;
-
-  local:
-    *;
-};
-
 CXXABI_1.3.4 {
 
     # typeinfo for decimal floating point types
@@ -1521,3 +1510,12 @@ CXXABI_1.3.6 {
     __cxa_deleted_virtual;
 
 } CXXABI_1.3.5;
+
+
+# Symbols in the support library (libsupc++) supporting transactional memory.
+CXXABI_TM_1 {
+
+  global:
+    __cxa_tm_cleanup;
+
+};
\ No newline at end of file