aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2012-10-11 08:38:28 +0000
committerRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2012-10-11 08:38:28 +0000
commit157de8a78afe89cc6f0bacce86a77b65b9bb42a8 (patch)
treef6049732ad8341f1f45c349d04c0c93e27ed1890 /libstdc++-v3
parentec930e05420ac2becb9d8903e25094dc99fb1e5a (diff)
Fix Solaris symbol versioning (PR libstdc++/54872)
PR libstdc++/54872 * config/abi/pre/gnu.ver (GLIBCXX_3.4.11) [!__sun__ && !__svr4__]: Don't export _ZNSt12system_errorC*. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@192349 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/config/abi/pre/gnu.ver5
2 files changed, 11 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7aecec65ddf..eac7f95dc54 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-11 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ PR libstdc++/54872
+ * config/abi/pre/gnu.ver (GLIBCXX_3.4.11) [!__sun__ && !__svr4__]:
+ Don't export _ZNSt12system_errorC*.
+
2012-10-10 Jack Howarth <howarth@bromo.med.uc.edu>
Jonathan Wakely <jwakely.gcc@gmail.com>
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index e23fdfb63b0..949ab50e5e3 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -1057,7 +1057,12 @@ GLIBCXX_3.4.11 {
_ZTISt12system_error;
_ZTVSt12system_error;
_ZNSt12system_errorD*Ev;
+ # Those template instantiations weren't exported on Solaris in GCC 4.6
+ # and aren't necessary for correct operation, so don't emit them now
+ # (PR libstdc++/54872).
+#if !defined(__sun__) && !defined(__svr4__)
_ZNSt12system_errorC*;
+#endif
_ZNKSt4hashISt10error_codeEclES0_;