From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 86EA720347160 for ; Thu, 26 Oct 2017 08:04:48 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5A5777EABD; Thu, 26 Oct 2017 15:08:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5A5777EABD Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lersek@redhat.com Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-110.rdu2.redhat.com [10.10.120.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A9EF6061B; Thu, 26 Oct 2017 15:08:32 +0000 (UTC) To: Ard Biesheuvel , Leif Lindholm Cc: "edk2-devel@lists.01.org" , "Gao, Liming" References: <20171026101209.31630-1-ard.biesheuvel@linaro.org> <2b0ce401-e334-335f-a352-7ce841041313@redhat.com> <20171026113309.i4thy2ardt2f6fw5@bivouac.eciton.net> From: Laszlo Ersek Message-ID: Date: Thu, 26 Oct 2017 17:08:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 26 Oct 2017 15:08:34 +0000 (UTC) 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 15:04:48 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 10/26/17 13:34, Ard Biesheuvel wrote: > 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 :) Been there, burned myself similarly :) >>> #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. Or use email-style quoting ("> "). Thanks, Laszlo >>>>> 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