From patchwork Wed Dec 12 17:53:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 205590 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 8976B2C008F for ; Thu, 13 Dec 2012 04:53:49 +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=1355939629; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:Date:Message-ID:Subject:From:To: Cc:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=gd83veJ IwNLk3X2NlvUUJI2MdCQ=; b=fPHJv2HBy9AGyvAhK9hOz5wJBj78/lPaH3tDZ/s 0y3lFl8qyPn0KdFE/EIAEgAuwmGr+4KmIrOXBbQ6nNFpwQIWrYYJiC8iT+tWlSQK x2PgmV/v7YYJgHfFSIg+OcdTP9m1vLHNMTrHO5rvrrUMMHUvSqm9aXQBuUB38uM2 PQxE= 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:MIME-Version:Received:Received:Date:Message-ID:Subject:From:To:Cc:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=HnIaTkrVDApT+uDKNMOJKOVZkxVyHLvCBa2sSOKwskFHzEbBp5MLmxEiJPJozk F1NRHLvP7SRD87npyCkReWSNdAanCib9kTDmE8aBmqTVS1rPrItAX6tU2poDqJna 9/io2iTI+pfzlO9kjdBuSd30BNHhASL1qIvOGhFrJE8mI=; Received: (qmail 24075 invoked by alias); 12 Dec 2012 17:53:43 -0000 Received: (qmail 24058 invoked by uid 22791); 12 Dec 2012 17:53:41 -0000 X-SWARE-Spam-Status: No, hits=-3.0 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_CX, UPPERCASE_50_75 X-Spam-Check-By: sourceware.org Received: from mail-qa0-f47.google.com (HELO mail-qa0-f47.google.com) (209.85.216.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 12 Dec 2012 17:53:35 +0000 Received: by mail-qa0-f47.google.com with SMTP id a19so4885383qad.20 for ; Wed, 12 Dec 2012 09:53:34 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.78.97 with SMTP id j33mr919029qck.107.1355334814741; Wed, 12 Dec 2012 09:53:34 -0800 (PST) Received: by 10.49.12.210 with HTTP; Wed, 12 Dec 2012 09:53:34 -0800 (PST) Date: Wed, 12 Dec 2012 09:53:34 -0800 Message-ID: Subject: PATCH: Remove 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' From: "H.J. Lu" To: Paolo Bonzini Cc: DJ Delorie , neroden@gcc.gnu.org, Alexandre Oliva , Ralf Wildenhues , gcc-patches@gcc.gnu.org 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 On Wed, Dec 12, 2012 at 9:30 AM, H.J. Lu wrote: > After further investigation, I found > > RAW_CXX_TARGET_EXPORTS = \ > $(BASE_TARGET_EXPORTS) \ > CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ > CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; > export CXX; > ... > > all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer > @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > TFLAGS="$(STAGE1_TFLAGS)"; \ > $(RAW_CXX_TARGET_EXPORTS) \ > cd $(TARGET_SUBDIR)/libsanitizer && \ > $(MAKE) $(BASE_FLAGS_TO_PASS) \ > CFLAGS="$(CFLAGS_FOR_TARGET)" \ > CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ > LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ > CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ > CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ > LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ > $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' > 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ > \ > TFLAGS="$(STAGE1_TFLAGS)" \ > $(TARGET-stage1-target-libsanitizer) > > The problem is > > CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' > > Those are bogus since > > 1. We never set RAW_CXX_FOR_TARGET. > 2. We have set > > CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ > CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; > export CXX; > > in RAW_CXX_TARGET_EXPORTS. There is no need to do anything. > Here is a patch to remove 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'. Tested on Linux/x86-64. OK to install? Thanks. diff --git a/Makefile.tpl b/Makefile.tpl index 5cdc119..dbcd5c3 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1281,7 +1281,7 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+] [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" exports="$(RAW_CXX_TARGET_EXPORTS)" - args="$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +] + args="$(EXTRA_TARGET_FLAGS)" +] [+ ELSE +]