* 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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 06a49e7..77ef9db 100644 (file)
--- 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 4921716..a533311 100644 (file)
--- 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)