From patchwork Mon Oct 17 15:00:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 120224 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 EA780B6F18 for ; Tue, 18 Oct 2011 02:01:25 +1100 (EST) Received: (qmail 18082 invoked by alias); 17 Oct 2011 15:01:14 -0000 Received: (qmail 18054 invoked by uid 22791); 17 Oct 2011 15:01:12 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 17 Oct 2011 15:00:56 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 50BD4D65; Mon, 17 Oct 2011 17:00:55 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id YJDruKRc-ngt; Mon, 17 Oct 2011 17:00:53 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id A9965D64; Mon, 17 Oct 2011 17:00:53 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.5+Sun/8.14.5/Submit) id p9HF0rxi004539; Mon, 17 Oct 2011 17:00:53 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org Subject: [v3] Remove duplicate symbol in gnu.ver (PR bootstrap/50715) Date: Mon, 17 Oct 2011 17:00:53 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes 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 As described in the PR, after Benjamin's patch 2011-10-10 Benjamin Kosnik PR libstdc++/49818 * config/abi/pre/gnu.ver (CXXABI_1.3.6): Add symbols. __cxa_get_exception_ptr is now present in both CXXABI_1.3.1 and CXXABI_1.3.6, which breaks Solaris bootstrap with Sun ld: ld: fatal: libstdc++-symbols.ver-sun: 5210: symbol '__cxa_get_exception_ptr' is already defined in file: libstdc++-symbols.ver-sun: symbol version conflict The duplicate serves no purpose I can see, and even with both entries, __cxa_get_exception_ptr is bound to version CXXABI_1.3.1 only on x86_64-unknown-linux-gnu, so it seems safe to remove. This restores Solaris bootstrap, tested on i386-pc-solaris2.11. Ok for mainline? Rainer 2011-10-14 Rainer Orth PR bootstrap/50715 * config/abi/pre/gnu.ver (CXXABI_1.3.6): Remove duplicate __cxa_get_exception_ptr. # HG changeset patch # Parent fbadbe8d19738b0abbefa6cabc32fa04d969b09f Remove duplicate symbol in gnu.ver (PR bootstrap/50715) diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver @@ -1496,7 +1496,6 @@ CXXABI_1.3.6 { __cxa_allocate_dependent_exception; __cxa_free_dependent_exception; - __cxa_get_exception_ptr; __cxa_deleted_virtual; -} CXXABI_1.3.5; \ No newline at end of file +} CXXABI_1.3.5;