Patchwork [v3] : Add CXXABI_1.3.8 to util/testsuite_abi.cc to fix libstdc++-abi/abi_check FAIL

login
register
mail settings
Submitter Uros Bizjak
Date May 9, 2013, 8:05 p.m.
Message ID <CAFULd4YC4P=CqrCUjTsTHEBhkDPpXio1QJtFus4POJ9Wx99kuA@mail.gmail.com>
Download mbox | patch
Permalink /patch/242833/
State New
Headers show

Comments

Uros Bizjak - May 9, 2013, 8:05 p.m.
Hello!

We have to handle CXXABI_1.3.8 in util/testsuite_abi.cc.
(Also, reorder entries a bit for better grouping).

2013-05-09  Uros Bizjak  <ubizjak@gmail.com>

        * testsuite/util/testsuite_abi.cc (check_version): Add CXXABI_1.3.8.

Testing on x86_64-pc-linux-gnu in progress. OK for mainline if it passes?

Uros.
Paolo Carlini - May 9, 2013, 11:25 p.m.
On 05/09/2013 10:05 PM, Uros Bizjak wrote:
> Hello!
>
> We have to handle CXXABI_1.3.8 in util/testsuite_abi.cc.
> (Also, reorder entries a bit for better grouping).
>
> 2013-05-09  Uros Bizjak  <ubizjak@gmail.com>
>
>          * testsuite/util/testsuite_abi.cc (check_version): Add CXXABI_1.3.8.
>
> Testing on x86_64-pc-linux-gnu in progress. OK for mainline if it passes?
Ok, thanks!

Paolo.

Patch

Index: testsuite/util/testsuite_abi.cc
===================================================================
--- testsuite/util/testsuite_abi.cc	(revision 198747)
+++ testsuite/util/testsuite_abi.cc	(working copy)
@@ -177,6 +177,7 @@  check_version(symbol& test, bool added)
       // NB: First version here must be the default version for this
       // version of DT_SONAME.
       known_versions.push_back("GLIBCXX_3.4");
+      known_versions.push_back("GLIBCXX_LDBL_3.4");
       known_versions.push_back("GLIBCXX_3.4.1");
       known_versions.push_back("GLIBCXX_3.4.2");
       known_versions.push_back("GLIBCXX_3.4.3");
@@ -184,9 +185,11 @@  check_version(symbol& test, bool added)
       known_versions.push_back("GLIBCXX_3.4.5");
       known_versions.push_back("GLIBCXX_3.4.6");
       known_versions.push_back("GLIBCXX_3.4.7");
+      known_versions.push_back("GLIBCXX_LDBL_3.4.7");
       known_versions.push_back("GLIBCXX_3.4.8");
       known_versions.push_back("GLIBCXX_3.4.9");
       known_versions.push_back("GLIBCXX_3.4.10");
+      known_versions.push_back("GLIBCXX_LDBL_3.4.10");
       known_versions.push_back("GLIBCXX_3.4.11");
       known_versions.push_back("GLIBCXX_3.4.12");
       known_versions.push_back("GLIBCXX_3.4.13");
@@ -196,10 +199,8 @@  check_version(symbol& test, bool added)
       known_versions.push_back("GLIBCXX_3.4.17");
       known_versions.push_back("GLIBCXX_3.4.18");
       known_versions.push_back("GLIBCXX_3.4.19");
-      known_versions.push_back("GLIBCXX_LDBL_3.4");
-      known_versions.push_back("GLIBCXX_LDBL_3.4.7");
-      known_versions.push_back("GLIBCXX_LDBL_3.4.10");
       known_versions.push_back("CXXABI_1.3");
+      known_versions.push_back("CXXABI_LDBL_1.3");
       known_versions.push_back("CXXABI_1.3.1");
       known_versions.push_back("CXXABI_1.3.2");
       known_versions.push_back("CXXABI_1.3.3");
@@ -207,7 +208,7 @@  check_version(symbol& test, bool added)
       known_versions.push_back("CXXABI_1.3.5");
       known_versions.push_back("CXXABI_1.3.6");
       known_versions.push_back("CXXABI_1.3.7");
-      known_versions.push_back("CXXABI_LDBL_1.3");
+      known_versions.push_back("CXXABI_1.3.8");
       known_versions.push_back("CXXABI_TM_1");
     }
   compat_list::iterator begin = known_versions.begin();
@@ -225,7 +226,7 @@  check_version(symbol& test, bool added)
 
       // Check that added symbols are added in the latest pre-release version.
       bool latestp = (test.version_name == "GLIBCXX_3.4.19"
-		     || test.version_name == "CXXABI_1.3.7"
+		     || test.version_name == "CXXABI_1.3.8"
 		     || test.version_name == "CXXABI_TM_1");
       if (added && !latestp)
 	test.version_status = symbol::incompatible;