[gcc/devel/omp/gcc-9] PR libstdc++/91067 add more missing exports for directory iterators
Tobias Burnus
burnus@gcc.gnu.org
Thu Mar 5 13:58:00 GMT 2020
https://gcc.gnu.org/g:7532a97151ca6e5b66dae43953e5f2d4ef68d9b9
commit 7532a97151ca6e5b66dae43953e5f2d4ef68d9b9
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Aug 29 14:22:13 2019 +0100
PR libstdc++/91067 add more missing exports for directory iterators
PR libstdc++/91067
* acinclude.m4 (libtool_VERSION): Bump to 6:28:0.
* configure: Regenerate.
* config/abi/pre/gnu.ver (GLIBCXX_3.4.28): Add new version. Export
missing symbols.
* testsuite/27_io/filesystem/iterators/91067.cc: Test move
constructors.
* testsuite/util/testsuite_abi.cc: Add new symbol version.
From-SVN: r275033
Diff:
---
libstdc++-v3/ChangeLog | 11 +++++++++++
libstdc++-v3/acinclude.m4 | 2 +-
libstdc++-v3/config/abi/pre/gnu.ver | 16 ++++++++++++++--
libstdc++-v3/configure | 2 +-
.../testsuite/27_io/filesystem/iterators/91067.cc | 16 ++++++++++++++++
libstdc++-v3/testsuite/util/testsuite_abi.cc | 3 ++-
6 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3875205..26f603b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2019-08-29 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/91067
+ * acinclude.m4 (libtool_VERSION): Bump to 6:28:0.
+ * configure: Regenerate.
+ * config/abi/pre/gnu.ver (GLIBCXX_3.4.28): Add new version. Export
+ missing symbols.
+ * testsuite/27_io/filesystem/iterators/91067.cc: Test move
+ constructors.
+ * testsuite/util/testsuite_abi.cc: Add new symbol version.
+
2019-08-29 Jakub Jelinek <jakub@redhat.com
* config/abi/post/aarch64-linux-gnu/baseline_symbols.txt: Update.
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 0112d64..3a9cd3c 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -3820,7 +3820,7 @@ changequote([,])dnl
fi
# For libtool versioning info, format is CURRENT:REVISION:AGE
-libtool_VERSION=6:27:0
+libtool_VERSION=6:28:0
# Everything parsed; figure out what files and settings to use.
case $enable_symvers in
diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index ff4b74c..07a0003 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -2268,11 +2268,11 @@ GLIBCXX_3.4.26 {
GLIBCXX_3.4.27 {
- # __shared_ptr<_Dir>::__shared_ptr()
+ # __shared_ptr<_Dir>::__shared_ptr() (base object ctor)
_ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE[012]EEC2Ev;
_ZNSt12__shared_ptrINSt10filesystem7__cxx114_DirELN9__gnu_cxx12_Lock_policyE[012]EEC2Ev;
- # __shared_ptr<recursive_directory_iterator::_Dir_stack>::__shared_ptr()
+ # __shared_ptr<recursive_directory_iterator::_Dir_stack>::__shared_ptr() (base object ctor)
_ZNSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEC2Ev;
_ZNSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEC2Ev;
@@ -2282,6 +2282,18 @@ GLIBCXX_3.4.27 {
} GLIBCXX_3.4.26;
+GLIBCXX_3.4.28 {
+
+ # __shared_ptr<_Dir>::__shared_ptr(__shared_ptr&&) (base object ctor)
+ _ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE[012]EEC2EOS4_;
+ _ZNSt12__shared_ptrINSt10filesystem7__cxx114_DirELN9__gnu_cxx12_Lock_policyE[012]EEC2EOS5_;
+
+ # __shared_ptr<recursive_directory_iterator::_Dir_stack>::__shared_ptr(__shared_ptr&&) (base object ctor)
+ _ZNSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEC2EOS5_;
+ _ZNSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE[012]EEC2EOS6_;
+
+} GLIBCXX_3.4.27;
+
# Symbols in the support library (libsupc++) have their own tag.
CXXABI_1.3 {
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 5acf79c..1c8b39e 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -79469,7 +79469,7 @@ $as_echo "$as_me: WARNING: === Symbol versioning will be disabled." >&2;}
fi
# For libtool versioning info, format is CURRENT:REVISION:AGE
-libtool_VERSION=6:27:0
+libtool_VERSION=6:28:0
# Everything parsed; figure out what files and settings to use.
case $enable_symvers in
diff --git a/libstdc++-v3/testsuite/27_io/filesystem/iterators/91067.cc b/libstdc++-v3/testsuite/27_io/filesystem/iterators/91067.cc
index 54172d9..39fbc7b 100644
--- a/libstdc++-v3/testsuite/27_io/filesystem/iterators/91067.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/iterators/91067.cc
@@ -37,9 +37,25 @@ test02()
d = std::move(d);
}
+void
+test03()
+{
+ std::filesystem::directory_iterator d;
+ auto d2 = std::move(d);
+}
+
+void
+test04()
+{
+ std::filesystem::recursive_directory_iterator d;
+ auto d2 = std::move(d);
+}
+
int
main()
{
test01();
test02();
+ test03();
+ test04();
}
diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc
index 1277972..dfce374 100644
--- a/libstdc++-v3/testsuite/util/testsuite_abi.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc
@@ -208,6 +208,7 @@ check_version(symbol& test, bool added)
known_versions.push_back("GLIBCXX_3.4.25");
known_versions.push_back("GLIBCXX_3.4.26");
known_versions.push_back("GLIBCXX_3.4.27");
+ known_versions.push_back("GLIBCXX_3.4.28");
known_versions.push_back("CXXABI_1.3");
known_versions.push_back("CXXABI_LDBL_1.3");
known_versions.push_back("CXXABI_1.3.1");
@@ -239,7 +240,7 @@ check_version(symbol& test, bool added)
test.version_status = symbol::incompatible;
// Check that added symbols are added in the latest pre-release version.
- bool latestp = (test.version_name == "GLIBCXX_3.4.27"
+ bool latestp = (test.version_name == "GLIBCXX_3.4.28"
|| test.version_name == "CXXABI_1.3.12"
|| test.version_name == "CXXABI_FLOAT128"
|| test.version_name == "CXXABI_TM_1");
More information about the Libstdc++-cvs
mailing list