From patchwork Mon Dec 10 08:22:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 204830 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 733522C0193 for ; Mon, 10 Dec 2012 19:22:50 +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=1355732571; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=LyVTjvyokSRJizuL3CWCpcPiDp4=; b=xIzeE6k+LLNEEmK p6EoKzShepiVuyUf2O5hOJb+hFFp0jjCa8u7rMhRRVlr9bSJFyv6Ketox91IlDDw eFo2EeJ8a8Ij3TOCUX3R2h485uyofbb3MPlXLW7nZbyQk8QWBXLEAMQSvQvpcnoH 1BU+odnVLd3n5dGTVkj7jJZdAfso= 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:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:References:In-Reply-To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=VsdpR3JX/HQQQzSEgAvDkWjr6NbVCMvrCDWgSHx55My4yDLNxSMgU621jYYKqP a4ek6t+0kKYeunMQLohJ+FHQm9nPwroq0PStpVTx/NTQP+j05Juyg7YIEL9Sze+f FdVJ43F0a8cCaolZEeiUeQ7XzRCh/caEz43sloZ9XStgA=; Received: (qmail 10478 invoked by alias); 10 Dec 2012 08:22:30 -0000 Received: (qmail 10457 invoked by uid 22791); 10 Dec 2012 08:22:27 -0000 X-SWARE-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, TW_CX, TW_DC X-Spam-Check-By: sourceware.org Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 10 Dec 2012 08:22:21 +0000 Received: from dslb-088-073-119-085.pools.arcor-ip.net ([88.73.119.85] helo=[192.168.42.216]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1Thyd1-0005Ng-2S; Mon, 10 Dec 2012 08:22:19 +0000 Message-ID: <50C59BB8.1040300@ubuntu.com> Date: Mon, 10 Dec 2012 09:22:16 +0100 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: GCC Patches , "libstdc++@gcc.gnu.org" Subject: Re: [patch] [libstdc++] Fix build failure with --enable-libstdcxx-debug References: <50C58D06.8020204@ubuntu.com> In-Reply-To: <50C58D06.8020204@ubuntu.com> 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 Am 10.12.2012 08:19, schrieb Matthias Klose: > Seen with a x86_64 x arm x arm cross build and --enable-libstdcxx-debug. The > ../config.h should not be hard-coded. Using the macro guarantees that the > rewritten macros for the debug builds are used. However I fail to see why the > unpatched version does work for the native build. > > Ok for the trunk and the 4.7 branch? and attaching the patch ... # DP: Fix cross build failure with --enable-libstdcxx-debug. * src/Makefile.am (libstdc++-symbols.ver): Use CONFIG_HEADER. * src/Makefile.in: Regenerate. --- libstdc++-v3/src/Makefile.am~ 2012-12-09 11:55:15.357516806 +0100 +++ libstdc++-v3/src/Makefile.am 2012-12-09 14:48:31.545377728 +0100 @@ -213,7 +213,7 @@ fi; \ fi $(EGREP) -v '^[ ]*#(#| |$$)' $@.tmp | \ - $(CC) -E -P -include ../config.h - > $@ || (rm -f $@ ; exit 1) + $(CC) -E -P -include $(CONFIG_HEADER) - > $@ || (rm -f $@ ; exit 1) rm -f $@.tmp CLEANFILES = libstdc++-symbols.ver