From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c06::241; helo=mail-io0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io0-x241.google.com (mail-io0-x241.google.com [IPv6:2607:f8b0:4001:c06::241]) (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 9778E2034CF6D for ; Thu, 26 Oct 2017 04:30:44 -0700 (PDT) Received: by mail-io0-x241.google.com with SMTP id j17so4626183iod.5 for ; Thu, 26 Oct 2017 04:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=d6ssFLgibCtmzcAEtTkfj3YpM3pTmoVptKySd9arXdg=; b=CKJzTyjE1rdlwbno+MmXdl8SJxNIPR0/tODlyr/Ze8C4OQpjIc4ByNudsGdYOwT2mG 3UKuJ3h2bEKO6I/neomY8ZvxXmDKCyFpdtBcocoRzAgbon6UnozPGjB6gywmqPleDdtA lOVA5uTZXW70COM/QSJHSYBrv13IBf+dVhdnc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=d6ssFLgibCtmzcAEtTkfj3YpM3pTmoVptKySd9arXdg=; b=NqeaTR6+EryceSO0+g9J3z9k6lTSdcwF1j3Q9i9bt+tndAQ6uAOUHpQJlJaXaIweHS 41jvr4lUF20TbJ2NtiPYhVI2/IJ++MY5QnLqWuLVCHwQURrrezKpjd4ap+EVXDgNH235 su0k3SR8k1qaMTrazGCGUD+r0DizjlisCLXqPN4F6a6wuStxipwRacMseWJ32nxigwfl jygZmHSDSegnEfcOzZLygOspPdZY32jIpOeG/ZnVpwCW/vv6m6OPzLccVIeCy7/RFmp5 15x9sMFjkmYaScZlPa5ex1QwxP6d9ZTUyevsMl1aNIHzMkCa5NlLOpwHDeidrGv2nT6O pbcQ== X-Gm-Message-State: AMCzsaXK9QBC3qcFH7GWVzT76/5J6l15y1wI5rlBJsWKHs3374tRFbSo SYv3YgqvQYzznkGliYseXo4FMSKqRnRxlrBHPwPf7w== X-Google-Smtp-Source: ABhQp+QBElXFAQUtZ291iHZi/U7DyZGGPZ8UeqIwqJ0qpjTYHJmLg/r4ACm3qdggQEYMV2EGHHeR9UIvBr98i7cTvIM= X-Received: by 10.107.82.6 with SMTP id g6mr28098348iob.253.1509017669980; Thu, 26 Oct 2017 04:34:29 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.131.167 with HTTP; Thu, 26 Oct 2017 04:34:29 -0700 (PDT) In-Reply-To: <20171026113309.i4thy2ardt2f6fw5@bivouac.eciton.net> References: <20171026101209.31630-1-ard.biesheuvel@linaro.org> <2b0ce401-e334-335f-a352-7ce841041313@redhat.com> <20171026113309.i4thy2ardt2f6fw5@bivouac.eciton.net> From: Ard Biesheuvel Date: Thu, 26 Oct 2017 12:34:29 +0100 Message-ID: To: Leif Lindholm Cc: Laszlo Ersek , "edk2-devel@lists.01.org" , "Gao, Liming" Subject: Re: [PATCH] BaseTools/tools_def: suppress GCC predefined macros in DTB compilation X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Oct 2017 11:30:44 -0000 Content-Type: text/plain; charset="UTF-8" On 26 October 2017 at 12:33, Leif Lindholm wrote: > On Thu, Oct 26, 2017 at 12:11:16PM +0100, Ard Biesheuvel wrote: >> On 26 October 2017 at 12:09, Laszlo Ersek wrote: >> > On 10/26/17 12:12, Ard Biesheuvel wrote: >> >> The standard GCC preprocessor we use to preprocess device tree sources >> >> files has a whole bunch of macros predefined, among which >> >> >> > >> > The example you wanted to paste is missing. >> > >> >> Yeah, the leading # made git-commit throw them away :-) > > Haha :) > >> #define __linux 1 >> #define __linux__ 1 >> #define __gnu_linux__ 1 >> #define linux 1 > > How did you make it not throw them away? > (I can find a few suggestions online, neither sounds optimal.) > Oh Gmail doesn't care, so pasting them here is not a problem In Git, I just added some spaces at the beginning. >> >> This causes a property like 'linux,code' to be converted into '1,code' >> >> which is obviously wrong. So let's get rid of all the predefined macros >> >> by passing -undef to the preprocessor command line. >> >> >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> >> Signed-off-by: Ard Biesheuvel >> >> --- >> >> BaseTools/Conf/tools_def.template | 2 +- >> >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> >> >> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template >> >> index df7c109438fd..98df0ffc9294 100755 >> >> --- a/BaseTools/Conf/tools_def.template >> >> +++ b/BaseTools/Conf/tools_def.template >> >> @@ -4369,7 +4369,7 @@ DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(DEST_DI >> >> DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h >> >> DEFINE GCC_ASLCC_FLAGS = -x c >> >> DEFINE GCC_WINDRES_FLAGS = -J rc -O coff >> >> -DEFINE GCC_DTCPP_FLAGS = -E -x assembler-with-cpp -imacros $(DEST_DIR_DEBUG)/AutoGen.h -nostdinc >> >> +DEFINE GCC_DTCPP_FLAGS = -E -x assembler-with-cpp -imacros $(DEST_DIR_DEBUG)/AutoGen.h -nostdinc -undef >> >> DEFINE GCC_IA32_RC_FLAGS = -I binary -O elf32-i386 -B i386 --rename-section .data=.hii >> >> DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386 --rename-section .data=.hii >> >> DEFINE GCC_IPF_RC_FLAGS = -I binary -O elf64-ia64-little -B ia64 --rename-section .data=.hii >> >> >> > >> > With the commit message fixed: >> > >> > Acked-by: Laszlo Ersek > > With the same precondition: > > Reviewed-by: Leif Lindholm > > / > Leif