From dd87c5c2283406aa06d262d383fbfb88d152fe22 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 3 Jan 2019 20:38:04 +0000 Subject: [PATCH] PR libstdc++/88681 export missing symbols These new facet functions were added to GCC 5.1 but the versions for the old std::string ABI were never exported from the shared library. PR libstdc++/88681 * config/abi/pre/gnu.ver: Add missing exports. * testsuite/22_locale/collate_byname/88681.cc: New test. * testsuite/22_locale/time_get/get/char/88681.cc: New test. * testsuite/22_locale/time_get/get/wchar_t/88681.cc: New test. From-SVN: r267563 --- libstdc++-v3/ChangeLog | 8 ++++ libstdc++-v3/config/abi/pre/gnu.ver | 3 ++ .../testsuite/22_locale/collate_byname/88681.cc | 48 ++++++++++++++++++++ .../testsuite/22_locale/time_get/get/char/88681.cc | 51 ++++++++++++++++++++++ .../22_locale/time_get/get/wchar_t/88681.cc | 51 ++++++++++++++++++++++ 5 files changed, 161 insertions(+) create mode 100644 libstdc++-v3/testsuite/22_locale/collate_byname/88681.cc create mode 100644 libstdc++-v3/testsuite/22_locale/time_get/get/char/88681.cc create mode 100644 libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/88681.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ba96526..02ec399 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2019-01-03 Jonathan Wakely + + PR libstdc++/88681 + * config/abi/pre/gnu.ver: Add missing exports. + * testsuite/22_locale/collate_byname/88681.cc: New test. + * testsuite/22_locale/time_get/get/char/88681.cc: New test. + * testsuite/22_locale/time_get/get/wchar_t/88681.cc: New test. + 2019-01-02 Jonathan Wakely * testsuite/23_containers/map/cons/deduction.cc: Test deduction from diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index 42697af..de3c87a 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -2069,6 +2069,9 @@ GLIBCXX_3.4.26 { _ZNSt3pmr28unsynchronized_pool_resource11do_allocateE[jmy][jmy]; _ZNSt3pmr28unsynchronized_pool_resource13do_deallocateEPv[jmy][jmy]; + _ZNSt14collate_bynameI[cw]EC[12]ERKSs[jmy]; + _ZNKSt8time_getI[cw]St19istreambuf_iteratorI[cw]St11char_traitsI[cw]EEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateP2tmcc; + } GLIBCXX_3.4.25; # Symbols in the support library (libsupc++) have their own tag. diff --git a/libstdc++-v3/testsuite/22_locale/collate_byname/88681.cc b/libstdc++-v3/testsuite/22_locale/collate_byname/88681.cc new file mode 100644 index 0000000..863319d --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/collate_byname/88681.cc @@ -0,0 +1,48 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-fno-inline" } +// { dg-do link { target c++11 } } + +#undef _GLIBCXX_USE_CXX11_ABI +#define _GLIBCXX_USE_CXX11_ABI 0 +#include +#include + +std::string s = "C"; + +template +struct facet : std::collate_byname +{ + facet() : std::collate_byname(s) { } +}; + +void +test01() +{ + facet c; + +#ifdef _GLIBCXX_USE_WCHAR_T + facet w; +#endif +} + +int +main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/char/88681.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/char/88681.cc new file mode 100644 index 0000000..5365871 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/time_get/get/char/88681.cc @@ -0,0 +1,51 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-fno-inline" } +// { dg-do link { target c++11 } } + +#undef _GLIBCXX_USE_CXX11_ABI +#define _GLIBCXX_USE_CXX11_ABI 0 +#include +#include + +using C = char; + +void +test01() +{ + using namespace std; + + locale loc_c = locale::classic(); + + basic_istringstream iss; + iss.imbue(loc_c); + const time_get& tget = use_facet>(iss.getloc()); + typedef istreambuf_iterator iter; + const iter end; + + tm time; + ios_base::iostate err = ios_base::badbit; + + tget.get(iter(iss), end, iss, err, &time, 'Y'); +} + +int +main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/88681.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/88681.cc new file mode 100644 index 0000000..cae6251 --- /dev/null +++ b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/88681.cc @@ -0,0 +1,51 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-fno-inline" } +// { dg-do link { target c++11 } } + +#undef _GLIBCXX_USE_CXX11_ABI +#define _GLIBCXX_USE_CXX11_ABI 0 +#include +#include + +using C = wchar_t; + +void +test01() +{ + using namespace std; + + locale loc_c = locale::classic(); + + basic_istringstream iss; + iss.imbue(loc_c); + const time_get& tget = use_facet>(iss.getloc()); + typedef istreambuf_iterator iter; + const iter end; + + tm time; + ios_base::iostate err = ios_base::badbit; + + tget.get(iter(iss), end, iss, err, &time, 'Y'); +} + +int +main() +{ + test01(); +} -- 2.7.4