diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2012-02-21 23:46:49 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2012-02-21 23:46:49 +0000 |
| commit | ca2fecdc056188a7c764f73ea14e7c25a7c9631f (patch) | |
| tree | ce2ac7f1f2136a165a080773a942fe51479536e0 /libstdc++-v3 | |
| parent | 2805e6c016d2e3ede3a49053b433e633ad6cee92 (diff) | |
| download | gcc-ca2fecdc056188a7c764f73ea14e7c25a7c9631f.zip gcc-ca2fecdc056188a7c764f73ea14e7c25a7c9631f.tar.gz gcc-ca2fecdc056188a7c764f73ea14e7c25a7c9631f.tar.bz2 | |
re PR libstdc++/50349 (/usr/bin/ld: warning: wildcard match appears in both version 'GLIBCXX_3.4' and 'CXXABI_1.3' in script)
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/abi/pre/gnu.ver | 20 |
3 files changed, 16 insertions, 15 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 366d219..eee0392 100644 --- 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 2bd23cd..e7e9162 100644 --- 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 41d38a7..9657024 100644 --- 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 |