From patchwork Mon Jan 9 23:38:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Kosnik X-Patchwork-Id: 135144 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 8431DB6FDF for ; Tue, 10 Jan 2012 10:39:02 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1326757144; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: Mime-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=r5lbNMqEivAs7cflSrsF/MLPPE0=; b=MX3lLG3DVM1ACB7 VI4aVFzoF2sjk5x8ENpiasI7MbjxgSXLroWqs+zdajmDgMqKDUbaGFzAjvqBQCcG gE+bYm2sSPW+vMX71aXqckllOTPmWJrwNG7HJ0qARAsDcnqQ/kazH/p74VCEe0pm EiZ3ExBMY3W3W5/sTd0wXkSmZ9Cw= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:Mime-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=juY1gc66dN7Zu8EB1pgfwmFiBA/omJ72XOg2pdvowXUXV5sf0mmpwWxDKAF+Or vWp26P9+k5SARVS7dvVC2V9i0//Zgc/lnQ/S3SA0gBdJeBX8yv6PYDF/1v6B+l+R zCmrh4fFtMiYpRmNSYYHpxV9QHTV+/WNnT4MOoRMbjqEY=; Received: (qmail 15723 invoked by alias); 9 Jan 2012 23:38:56 -0000 Received: (qmail 15701 invoked by uid 22791); 9 Jan 2012 23:38:54 -0000 X-SWARE-Spam-Status: No, hits=-6.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, TW_CX, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 09 Jan 2012 23:38:35 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q09NcYqE013666 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Jan 2012 18:38:34 -0500 Received: from shotwell (ovpn-113-51.phx2.redhat.com [10.3.113.51]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q09NcU3p024996 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 9 Jan 2012 18:38:31 -0500 Date: Mon, 9 Jan 2012 15:38:25 -0800 From: Benjamin Kosnik To: Kai Tietz Cc: Paolo Carlini , GCC Patches , "libstdc++" Subject: Re: [patch libstdc++]: Fix PR/51673 Message-ID: <20120109153825.416355fd@shotwell> In-Reply-To: References: <4F00EEC7.7000700@oracle.com> Mime-Version: 1.0 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 This is ok, but I realized that some of the newer CXXABI symbols were missing, so I added them as well and then checked all of this in. See attached patch. best, Benjamin 2012-01-09 Kai Tietz PR libstc++/51673 part 2 * config/abi/pre/gnu-versioned-namespace.ver: Adjusted new/delete operators signature for LLP64 size_t, and adjusted signatures for mt-allocator using size_t. 2012-01-09 Benjamin Kosnik PR libstc++/51673 part 1 * config/abi/pre/gnu-versioned-namespace.ver: Sync cxxabi symbols with gnu.ver. diff --git a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver index 13f06ef..2bd23cd 100644 --- a/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver +++ b/libstdc++-v3/config/abi/pre/gnu-versioned-namespace.ver @@ -1,6 +1,6 @@ ## Linker script for GNU namespace versioning. ## -## Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009, 2011 +## Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009, 2011, 2012 ## Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. @@ -42,9 +42,9 @@ GLIBCXX_7.0 { __once_proxy; # operator new(size_t) - _Znw[jm]; + _Znw[jmy]; # operator new(size_t, std::nothrow_t const&) - _Znw[jm]RKSt9nothrow_t; + _Znw[jmy]RKSt9nothrow_t; # operator delete(void*) _ZdlPv; @@ -52,9 +52,9 @@ GLIBCXX_7.0 { _ZdlPvRKSt9nothrow_t; # operator new[](size_t) - _Zna[jm]; + _Zna[jmy]; # operator new[](size_t, std::nothrow_t const&) - _Zna[jm]RKSt9nothrow_t; + _Zna[jmy]RKSt9nothrow_t; # operator delete[](void*) _ZdaPv; @@ -93,16 +93,16 @@ GLIBCXX_7.0 { # __gnu_cxx::__pool _ZN9__gnu_cxx3__76__poolILb[01]EE13_M_initializeEv; - _ZN9__gnu_cxx3__76__poolILb[01]EE16_M_reserve_blockE[jm][jm]; - _ZN9__gnu_cxx3__76__poolILb[01]EE16_M_reclaim_blockEPc[jm]; + _ZN9__gnu_cxx3__76__poolILb[01]EE16_M_reserve_blockE[jmy][jmy]; + _ZN9__gnu_cxx3__76__poolILb[01]EE16_M_reclaim_blockEPc[jmy]; _ZN9__gnu_cxx3__76__poolILb[01]EE10_M_destroyEv; _ZN9__gnu_cxx3__76__poolILb1EE16_M_get_thread_idEv; - _ZN9__gnu_cxx3__717__pool_alloc_base9_M_refillE[jm]; - _ZN9__gnu_cxx3__717__pool_alloc_base16_M_get_free_listE[jm]; + _ZN9__gnu_cxx3__717__pool_alloc_base9_M_refillE[jmy]; + _ZN9__gnu_cxx3__717__pool_alloc_base16_M_get_free_listE[jmy]; _ZN9__gnu_cxx3__717__pool_alloc_base12_M_get_mutexEv; - _ZN9__gnu_cxx3__79free_list6_M_getE[jm]; + _ZN9__gnu_cxx3__79free_list6_M_getE[jmy]; _ZN9__gnu_cxx3__79free_list8_M_clearEv; # __gnu_cxx::stdio_sync_filebuf @@ -145,16 +145,19 @@ CXXABI_2.0 { global: __cxa_allocate_exception; + __cxa_allocate_dependent_exception; __cxa_bad_cast; __cxa_bad_typeid; __cxa_begin_catch; __cxa_begin_cleanup; __cxa_call_unexpected; __cxa_current_exception_type; + __cxa_deleted_virtual; __cxa_demangle; __cxa_end_catch; __cxa_end_cleanup; __cxa_free_exception; + __cxa_free_dependent_exception; __cxa_get_exception_ptr; __cxa_get_globals; __cxa_get_globals_fast; @@ -199,6 +202,11 @@ CXXABI_2.0 { _ZSt17current_exceptionv; _ZSt17rethrow_exceptionNSt15__exception_ptr13exception_ptrE; + # std::nested_exception + _ZNSt16nested_exceptionD*; + _ZTISt16nested_exception; + _ZTVSt16nested_exception; + # std::bad_function_call. _ZNSt17bad_function_callD*; _ZTISt17bad_function_call; @@ -287,6 +295,11 @@ CXXABI_2.0 { _ZTIPDn; _ZTIPKDn; + # typeinfo for __int128 and unsigned __int128 + _ZTI[no]; + _ZTIP[no]; + _ZTIPK[no]; + # virtual table _ZTVN10__cxxabiv117__array_type_infoE; _ZTVN10__cxxabiv117__class_type_infoE;