From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 6 Jan 2015 13:13:36 +0000 (+0000)
Subject: * config/abi/pre/gnu.ver: Fix version conflict for std::locale::name().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=63f213610320ffb3279ca0425b5e7de8092fef53;p=gcc.git

* config/abi/pre/gnu.ver: Fix version conflict for std::locale::name().

From-SVN: r219260
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e3b44e2529d..ebd789c219d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-06  Jonathan Wakely  <jwakely@redhat.com>
+
+	* config/abi/pre/gnu.ver: Fix version conflict for std::locale::name().
+
 2015-01-05  Jakub Jelinek  <jakub@redhat.com>
 
 	Update copyright years.
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index e680e99b2d0..7bb65e950d1 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -118,7 +118,7 @@ GLIBCXX_3.4 {
 #     std::locale::name();
       std::locale::none*;
       std::locale::numeric*;
-      std::locale::[A-Zn-z]*;
+      std::locale::[A-Zo-z]*;
       std::locale::_[A-Ha-z]*;
       std::locale::_Impl::[A-Za-z]*;
 #     std::locale::_Impl::_M_[A-Za-z]*;