diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-21 19:11:27 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-03-21 19:11:27 +0000 |
| commit | 310f246d7b336390d7b64da67459471dd580ab19 (patch) | |
| tree | 64e6b637b0b8c7e6e0bda975c31b1a0d345b15fa | |
| parent | 04d8673199b30867aa9b774130bf283f75fb82a0 (diff) | |
| download | gcc-310f246d7b336390d7b64da67459471dd580ab19.tar.gz | |
* testsuite/util/testsuite_abi.cc (check_version): Set incompatible
even when adding symbols to CXXABI_1.3, GLIBCXX_LDBL_3.4 and
CXXABI_LDBL_1.3 versions.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@171261 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_abi.cc | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 06a49e70f85..77ef9dbd6b7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2011-03-21 Jakub Jelinek <jakub@redhat.com> + + * testsuite/util/testsuite_abi.cc (check_version): Set incompatible + even when adding symbols to CXXABI_1.3, GLIBCXX_LDBL_3.4 and + CXXABI_LDBL_1.3 versions. + 2011-03-21 Benjamin Kosnik <bkoz@redhat.com> * config/abi/pre/gnu.ver: Remove typeinfo name exports for C++0x types. diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc index 4921716b75c..a533311bb73 100644 --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // This library is free software; you can redistribute it and/or @@ -217,10 +217,14 @@ check_version(symbol& test, bool added) else test.version_status = symbol::incompatible; - // Check that added symbols aren't added in the base version. - if (added && test.version_name == known_versions[0]) + // Check that added symbols aren't added in the base versions. + if (added + && (test.version_name == known_versions[0] + || test.version_name == "CXXABI_1.3" + || test.version_name == "GLIBCXX_LDBL_3.4" + || test.version_name == "CXXABI_LDBL_1.3")) test.version_status = symbol::incompatible; - + // Check that long double compatibility symbols demangled as // __float128 are put into some _LDBL_ version name. if (added && test.demangled_name.find("__float128") != std::string::npos) |