From patchwork Wed Jun 18 09:42:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramana Radhakrishnan X-Patchwork-Id: 32127 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EDDA4203F3 for ; Wed, 18 Jun 2014 09:42:51 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id v10sf1855824pde.11 for ; Wed, 18 Jun 2014 02:42:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mailing-list:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:sender :delivered-to:message-id:date:from:user-agent:mime-version:to:cc :subject:x-original-sender:x-original-authentication-results :content-type; bh=sMpo72e1gJStJw1a9k/L5vTnv0HSmtiirpIt0fthKHs=; b=ar5Zh4jW7ZzBCKZF86AAPBfW0vj4UyTZWr1/qVNkz+DC9NvONTB0JrRlS6ezCRivtD VqmQmcxCvuFwyntP1kR+eH+tl+K5S//etEC4NsHgjQrC9PNC3p47oQ0CQ8wl9ch+wLxf gLG2KNQOudsLWNQle0tWyA/L2W0e0qw03nEQS6/ultPKHgSlc4RiOSEDGzxqp1ojZUBC g1nzaiGIWcuDCDGf0fB1pn5/SSrUcVX7+zBDzawWMuOD5o6PZ+qy4xT4zpZPVl1o36M/ /rRzAVII7MRkSXWIq0OPh87F/thiHwIU+NtEwFRQHoC8TioYYms0gS7Z+UjSEjsozxbg A62g== X-Gm-Message-State: ALoCoQndZ8dx7qFIN7gQcfrA47wcWZMYVMlFt+SAwGEiptyDFwgPgBeu2Cirl1nbxKCiSx4GFYA8 X-Received: by 10.68.135.200 with SMTP id pu8mr324354pbb.9.1403084571182; Wed, 18 Jun 2014 02:42:51 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.42 with SMTP id 39ls25770qgq.26.gmail; Wed, 18 Jun 2014 02:42:51 -0700 (PDT) X-Received: by 10.58.118.168 with SMTP id kn8mr460634veb.44.1403084571085; Wed, 18 Jun 2014 02:42:51 -0700 (PDT) Received: from mail-ve0-x22a.google.com (mail-ve0-x22a.google.com [2607:f8b0:400c:c01::22a]) by mx.google.com with ESMTPS id jl6si623522vdb.50.2014.06.18.02.42.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Jun 2014 02:42:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::22a as permitted sender) client-ip=2607:f8b0:400c:c01::22a; Received: by mail-ve0-f170.google.com with SMTP id i13so556291veh.1 for ; Wed, 18 Jun 2014 02:42:50 -0700 (PDT) X-Received: by 10.58.198.46 with SMTP id iz14mr383790vec.53.1403084570898; Wed, 18 Jun 2014 02:42:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp270789vcb; Wed, 18 Jun 2014 02:42:50 -0700 (PDT) X-Received: by 10.68.136.99 with SMTP id pz3mr1128319pbb.150.1403084569863; Wed, 18 Jun 2014 02:42:49 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id ro12si1601378pab.172.2014.06.18.02.42.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2014 02:42:49 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-370520-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 12838 invoked by alias); 18 Jun 2014 09:42:37 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 Received: (qmail 12817 invoked by uid 89); 18 Jun 2014 09:42:36 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: collaborate-mta1.arm.com Received: from fw-tnat.austin.arm.com (HELO collaborate-mta1.arm.com) (217.140.110.23) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 18 Jun 2014 09:42:35 +0000 Received: from [10.1.209.147] (e104577-lin.cambridge.arm.com [10.1.209.147]) by collaborate-mta1.arm.com (Postfix) with ESMTPS id 3CD7F13F886; Wed, 18 Jun 2014 04:42:33 -0500 (CDT) Message-ID: <53A15F08.5060308@arm.com> Date: Wed, 18 Jun 2014 10:42:32 +0100 From: Ramana Radhakrishnan User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org ; " , "libstdc++@gcc.gnu.org" CC: paolo.carlini@oracle.com Subject: [Patch libstdc++] PR61536 Export out of line comparison operations. X-IsSubscribed: yes X-Original-Sender: ramana.radhakrishnan@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::22a as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@gcc.gnu.org X-Google-Group-Id: 836684582541 PR61536 is a case where linking fails on arm-linux-gnueabi* and arm-eabi* systems as the C++ ABI for ARM specifies out of line comparison operators for typeinfo. Rev r211355 tightened the symbols exported by libstdc++ a bit too much which caused some carnage in the test results for arm-linux-gnueabihf. Paolo proposed this on the bugzilla and asked if I could commit it. I've tweaked the comment slightly. Tested on arm-none-linux-gnueabihf and verified the link time failures now disappear. Applied to trunk. Ramana 2014-06-18 Paolo Carlini Ramana Radhakrishnan PR libstdc++/61536 * config/abi/pre/gnu.ver: Adjust for out of line comparisons. diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index e7de756..63c9130 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -16,6 +16,18 @@ ## You should have received a copy of the GNU General Public License along ## with this library; see the file COPYING3. If not see ## . +// By default follow the old inline rules to avoid ABI changes. +// Logic similar to libsupc++/typeinfo (libstdc++/61536). See +// commentary on out of line comparisons. + +#ifndef __GXX_TYPEINFO_EQUALITY_INLINE + #if !__GXX_WEAK__ + #define __GXX_TYPEINFO_EQUALITY_INLINE 0 + #else + #define __GXX_TYPEINFO_EQUALITY_INLINE 1 + #endif +#endif + GLIBCXX_3.4 { @@ -760,6 +772,11 @@ GLIBCXX_3.4 { _ZNKSt9type_info1*; _ZNSt9type_infoD*; +#if !__GXX_TYPEINFO_EQUALITY_INLINE + _ZNKSt9type_info6before*; + _ZNKSt9type_infoeq*; +#endif + # std::exception _ZNKSt9exception4whatEv; _ZNSt9exceptionD*;