From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::244; helo=mail-wm0-x244.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C3EFA20955F04 for ; Tue, 27 Feb 2018 10:27:24 -0800 (PST) Received: by mail-wm0-x244.google.com with SMTP id 191so418425wmm.4 for ; Tue, 27 Feb 2018 10:33:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=7v3plkvs7xtkviDd6wyhPhd0Wx7iljFcUkKmei5DyD0=; b=I2EfawfsvSGZ7Tx+fQsdzIlQ+UI36+1u1PKEaXLUfiArTdhCr3hvSyWTQj/hxXOYd6 ZrN5XIcQF7oPRUrusYSOtoC6R8X5FF694uCZzt7TD3JCS0GmXBMOhrwVSDqLVs2H3ksa jwW78/ZDI0AAmE0U8938QMq/KFSs6EdZLicEs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=7v3plkvs7xtkviDd6wyhPhd0Wx7iljFcUkKmei5DyD0=; b=qDP6dWbTRpduPDwiTMCkQit4/z3WCQyeoNmKnKG5XUPFttO1Jzsp4Cm2oRnGSlyxRi ZJb664ZjL6iraDO6KzBDCZLe7XxAPwdqRl6/1GhDvSY6BjXdYA5rsJm2PSLKERZq7fXf 1cY0UemlF5F/fe0AIOOCw1ebd8akgh1lTAr20VGOt24+mqYmGwycMk+isJLG15DEKo6H 5pgkFa8gWVdq2xF21Rc4JDXlhQXL6gEJqX4Wkl80/2w7Nhwp1l30ev2t9ajuP/tQD6up gEtpQ08ah70vCP6knos06nYoxKdBlqmW9zLQNo/XX1xGizk2SovxqTMyFAjVwB05lRo/ uhDw== X-Gm-Message-State: APf1xPDlK3br6kaLfGpRGDUSLlJySwulrzgLhxRCgu4L35KrTLGIMpkA uOhWux9YTWHdYjiXk0mQd/WDlsaBjgE= X-Google-Smtp-Source: AG47ELujNjZKsZgvarpvxUJ33+7lw9DJOf9YULmqGnZpmD28Uvsot2H+sD2xaNMELumNa4ZD+Nbc9Q== X-Received: by 10.28.90.197 with SMTP id o188mr11707918wmb.136.1519756409862; Tue, 27 Feb 2018 10:33:29 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id 55sm17831702wrw.87.2018.02.27.10.33.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Feb 2018 10:33:28 -0800 (PST) Date: Tue, 27 Feb 2018 18:33:27 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: edk2-devel@lists.01.org, liming.gao@intel.com, yonghong.zhu@intel.com Message-ID: <20180227183327.lg6juoabvbc3jute@bivouac.eciton.net> References: <20180227175132.1607-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 In-Reply-To: <20180227175132.1607-1-ard.biesheuvel@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH] BaseTools/tools_def: use separate PP definition for DTC X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2018 18:27:25 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Feb 27, 2018 at 05:51:32PM +0000, Ard Biesheuvel wrote: > Clang's preprocessor behaves differently from GCC's, and produces > intermediate device tree source that still contains #pragma pack() > and other directives that the device tree compiler chokes on. > > For assembling device tree sources, it matters very little which > preprocessor is being used, so let's just use GNU CPP explicitly. Ah, right, same fundamental issue as 5b8766bb92debfa7b2f45a4a6d683b4227360d66. However, this time triggered by autogen seemingly forcing inclusion of lots of central header files that are not even used, like MdePkg/Include/IndustryStandard/Bluetooth.h MdePkg/Include/IndustryStandard/Acpi10.h and so on. Is there any way to suppress these implicit includes from .dts processing? / Leif > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel > > --- > We may need to revisit this in the future, but at present, it is highly > unlikely that someone has DTC installed but not GNU CPP, so for the time > being, this should be a sufficient fix. > > BaseTools/Conf/build_rule.template | 2 +- > BaseTools/Conf/tools_def.template | 10 +++------- > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template > index 77ed282e0311..92482341ab11 100755 > --- a/BaseTools/Conf/build_rule.template > +++ b/BaseTools/Conf/build_rule.template > @@ -278,7 +278,7 @@ > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dtb > > > - "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i > + "$(DTCPP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i > "$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i > > [Visual-Form-Representation-File] > diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template > index 427ad60b0e26..a5463797c330 100755 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -237,6 +237,7 @@ DEFINE IPHONE_TOOLS = /Developer/Platforms/iPhoneOS.platform/Develope > > DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G++ Lite/bin > > +DEFINE DTCPP_BIN = ENV(DTCPP_PREFIX)cpp > DEFINE DTC_BIN = ENV(DTC_PREFIX)dtc > > #################################################################################### > @@ -4499,6 +4500,8 @@ DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N > RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG = > NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug > *_*_*_DTC_FLAGS = -H epapr > +*_*_*_DTCPP_PATH = DEF(DTCPP_BIN) > +*_*_*_DTC_PATH = DEF(DTC_BIN) > > DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common > DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe > @@ -4912,7 +4915,6 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os > *_GCC46_*_MAKE_PATH = DEF(GCC46_IA32_PREFIX)make > *_GCC46_*_*_DLL = ENV(GCC46_DLL) > *_GCC46_*_ASL_PATH = DEF(UNIX_IASL_BIN) > -*_GCC46_*_DTC_PATH = DEF(DTC_BIN) > > *_GCC46_*_PP_FLAGS = DEF(GCC_PP_FLAGS) > *_GCC46_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > @@ -5023,7 +5025,6 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v > *_GCC47_*_MAKE_PATH = DEF(GCC47_IA32_PREFIX)make > *_GCC47_*_*_DLL = ENV(GCC47_DLL) > *_GCC47_*_ASL_PATH = DEF(UNIX_IASL_BIN) > -*_GCC47_*_DTC_PATH = DEF(DTC_BIN) > > *_GCC47_*_PP_FLAGS = DEF(GCC_PP_FLAGS) > *_GCC47_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > @@ -5163,7 +5164,6 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s > *_GCC48_*_MAKE_PATH = DEF(GCC48_IA32_PREFIX)make > *_GCC48_*_*_DLL = ENV(GCC48_DLL) > *_GCC48_*_ASL_PATH = DEF(UNIX_IASL_BIN) > -*_GCC48_*_DTC_PATH = DEF(DTC_BIN) > > *_GCC48_*_PP_FLAGS = DEF(GCC_PP_FLAGS) > *_GCC48_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > @@ -5303,7 +5303,6 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s > *_GCC49_*_MAKE_PATH = DEF(GCC49_IA32_PREFIX)make > *_GCC49_*_*_DLL = ENV(GCC49_DLL) > *_GCC49_*_ASL_PATH = DEF(UNIX_IASL_BIN) > -*_GCC49_*_DTC_PATH = DEF(DTC_BIN) > > *_GCC49_*_PP_FLAGS = DEF(GCC_PP_FLAGS) > *_GCC49_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > @@ -5449,7 +5448,6 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) > *_GCC5_*_MAKE_PATH = DEF(GCC5_IA32_PREFIX)make > *_GCC5_*_*_DLL = ENV(GCC5_DLL) > *_GCC5_*_ASL_PATH = DEF(UNIX_IASL_BIN) > -*_GCC5_*_DTC_PATH = DEF(DTC_BIN) > > *_GCC5_*_PP_FLAGS = DEF(GCC_PP_FLAGS) > *_GCC5_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS) > @@ -5606,7 +5604,6 @@ RELEASE_GCC5_AARCH64_DLINK_FLAGS = DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -Os -L$(W > *_CLANG35_*_MAKE_PATH = make > *_CLANG35_*_*_DLL = ENV(CLANG35_DLL) > *_CLANG35_*_ASL_PATH = DEF(UNIX_IASL_BIN) > -*_CLANG35_*_DTC_PATH = DEF(DTC_BIN) > > *_CLANG35_*_PP_FLAGS = DEF(GCC_PP_FLAGS) > *_CLANG35_*_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) > @@ -5684,7 +5681,6 @@ RELEASE_CLANG35_AARCH64_CC_FLAGS = DEF(CLANG35_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS) > *_CLANG38_*_MAKE_PATH = make > *_CLANG38_*_*_DLL = ENV(CLANG38_DLL) > *_CLANG38_*_ASL_PATH = DEF(UNIX_IASL_BIN) > -*_CLANG38_*_DTC_PATH = DEF(DTC_BIN) > > *_CLANG38_*_APP_FLAGS = > *_CLANG38_*_ASL_FLAGS = DEF(IASL_FLAGS) > -- > 2.11.0 >