From patchwork Mon Nov 7 11:36:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 124066 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 3F5EE1007D3 for ; Mon, 7 Nov 2011 22:36:56 +1100 (EST) Received: (qmail 363 invoked by alias); 7 Nov 2011 11:36:50 -0000 Received: (qmail 32765 invoked by uid 22791); 7 Nov 2011 11:36:49 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-wy0-f175.google.com (HELO mail-wy0-f175.google.com) (74.125.82.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 07 Nov 2011 11:36:31 +0000 Received: by wyh5 with SMTP id 5so4835828wyh.20 for ; Mon, 07 Nov 2011 03:36:30 -0800 (PST) MIME-Version: 1.0 Received: by 10.216.221.163 with SMTP id r35mr74774wep.21.1320665790057; Mon, 07 Nov 2011 03:36:30 -0800 (PST) Received: by 10.216.63.83 with HTTP; Mon, 7 Nov 2011 03:36:30 -0800 (PST) In-Reply-To: <201111071157.40992.ebotcazou@adacore.com> References: <201111071040.23569.ebotcazou@adacore.com> <201111071157.40992.ebotcazou@adacore.com> Date: Mon, 7 Nov 2011 11:36:30 +0000 Message-ID: Subject: Re: [v3] define string::pop_back() From: Jonathan Wakely To: Eric Botcazou Cc: gcc-patches@gcc.gnu.org, "libstdc++" Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 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. 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;