Patchwork [v3] define string::pop_back()

login
register
mail settings
Submitter Jonathan Wakely
Date Nov. 7, 2011, 11:36 a.m.
Message ID <CAH6eHdT9a_kHNnSMJzaevotMT5O10Chv0fAW7-K3uk6Tt_OYqA@mail.gmail.com>
Download mbox | patch
Permalink /patch/124066/
State New
Headers show

Comments

Jonathan Wakely - Nov. 7, 2011, 11:36 a.m.
On 7 November 2011 10:57, Eric Botcazou wrote:
>> Won't that fail to match string::max_size?
>
> No, if it doesn't appear in the list, then it isn't matched by the regexp.
>
>> For GNU I added a regex for that explicitly:
>>
>> +    _ZNKSs8max_size*;
>> +    _ZNKSbIwSt11char_traitsIwESaIwEE8max_size*;
>
> What is GNU here?  The Solaris version file is a massaged version of gnu.ver.
> You patched gnu.ver incorrectly so symbols are now matched twice; you need to
> fix that by avoiding the double matching.

Ah, I see how I screwed it up now. I didn't see a problem with
pop_back in the abi check test results, but it did have the wrong
version.

This should undo the mess and fix the double match.

       * config/abi/pre/gnu.ver: Fix exports for string::pop_back.

Tested x86_64-linux, committed to trunk as r181081.

Patch

Index: config/abi/pre/gnu.ver
===================================================================
--- config/abi/pre/gnu.ver	(revision 181077)
+++ config/abi/pre/gnu.ver	(working copy)
@@ -188,7 +188,7 @@ 
     _ZNSs[0-58-9]a*;
     _ZNSs5beginEv;
     _ZNSs[0-58-9][c-e]*;
-    _ZNSs[0-58-9][g-z]*;
+    _ZNSs[0-59][g-z]*;
 #   _ZNSs[67][a-z]*E[PRcjmvy]*;
     _ZNSs6appendE[PRcjmvy]*;
     _ZNSs6assignE[PRcjmvy]*;
@@ -225,10 +225,9 @@ 
     _ZNKSs[0-3][a-b]*;
     _ZNKSs[5-9][a-b]*;
     _ZNKSs[0-9][d-e]*;
-    _ZNKSs[0-79][g-z]*;
+    _ZNKSs[0-9][g-z]*;
     _ZNKSs[0-9][0-9][a-z]*;
     _ZNKSs4find*;
-    _ZNKSs8max_size*;
     _ZNKSs[a-z]*;
     _ZNKSs4_Rep12_M_is_leakedEv;
     _ZNKSs4_Rep12_M_is_sharedEv;
@@ -250,7 +249,7 @@ 
     _ZNSbIwSt11char_traitsIwESaIwEE[0-58-9]a*;
     _ZNSbIwSt11char_traitsIwESaIwEE5beginEv;
     _ZNSbIwSt11char_traitsIwESaIwEE[0-58-9][c-e]*;
-    _ZNSbIwSt11char_traitsIwESaIwEE[0-58-9][g-z]*;
+    _ZNSbIwSt11char_traitsIwESaIwEE[0-59][g-z]*;
 #   _ZNSbIwSt11char_traitsIwESaIwEE[67][a-b]*E[PRwjmvy]*;
     _ZNSbIwSt11char_traitsIwESaIwEE6appendE[PRwjmvy]*;
     _ZNSbIwSt11char_traitsIwESaIwEE6assignE[PRwjmvy]*;
@@ -287,11 +286,10 @@ 
     _ZNKSbIwSt11char_traitsIwESaIwEE[0-3][a-b]*;
     _ZNKSbIwSt11char_traitsIwESaIwEE[5-9][a-b]*;
     _ZNKSbIwSt11char_traitsIwESaIwEE[0-9][d-e]*;
-    _ZNKSbIwSt11char_traitsIwESaIwEE[0-79][g-z]*;
+    _ZNKSbIwSt11char_traitsIwESaIwEE[0-9][g-z]*;
     _ZNKSbIwSt11char_traitsIwESaIwEE[0-9][0-9][a-z]*;
     _ZNKSbIwSt11char_traitsIwESaIwEE[a-z]*;
     _ZNKSbIwSt11char_traitsIwESaIwEE4find*;
-    _ZNKSbIwSt11char_traitsIwESaIwEE8max_size*;
     _ZNKSbIwSt11char_traitsIwESaIwEE4_Rep12_M_is_leakedEv;
     _ZNKSbIwSt11char_traitsIwESaIwEE4_Rep12_M_is_sharedEv;
     _ZNKSbIwSt11char_traitsIwESaIwEE6_M_repEv;