testsuite_abi.cc (check_version): Set incompatible even when adding symbols to CXXABI_1.3...

* 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.

From-SVN: r171257
This commit is contained in:
Jakub Jelinek 2011-03-21 20:00:52 +01:00 committed by Jakub Jelinek
parent 6374564070
commit c75bd36be4
2 changed files with 14 additions and 4 deletions

View File

@ -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.

View File

@ -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)