On Thu, Oct 26, 2017 at 12:11:16PM +0100, Ard Biesheuvel wrote: > On 26 October 2017 at 12:09, Laszlo Ersek <[email protected]> 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.) > >> 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 <[email protected]> > >> --- > >> 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 <[email protected]> With the same precondition: Reviewed-by: Leif Lindholm <[email protected]> / Leif _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
