On 17 December 2015 at 10:04, Gao, Liming <[email protected]> wrote: > Ard: > Do GCC_VFRPP_FLAGS and GCC_ASLPP_FLAGS require this change? >
Probably, let me change that. > -----Original Message----- > From: Ard Biesheuvel [mailto:[email protected]] > Sent: Wednesday, December 16, 2015 6:10 PM > To: [email protected]; Gao, Liming; Zhu, Yonghong > Cc: Ard Biesheuvel > Subject: [PATCH 1/2] BaseTools CLANG35: use -target in PP flags as well > > The Clang preprocessor may rely on builtin defines that are target dependent, > so we should add the -target argument also when invoking the preprocessor > directly. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ard Biesheuvel <[email protected]> > --- > BaseTools/Conf/tools_def.template | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/BaseTools/Conf/tools_def.template > b/BaseTools/Conf/tools_def.template > index 6e26bbca934b..0e350be6b468 100644 > --- a/BaseTools/Conf/tools_def.template > +++ b/BaseTools/Conf/tools_def.template > @@ -5183,9 +5183,12 @@ RELEASE_GCC49_AARCH64_CC_FLAGS = > DEF(GCC49_AARCH64_CC_FLAGS) -Wno-unused-but-s > *_CLANG35_*_ASLCC_PATH = ENV(CLANG35_BIN)clang > *_CLANG35_*_ASLPP_PATH = ENV(CLANG35_BIN)clang > > +DEFINE CLANG35_ARM_TARGET = -target armv7-a > +DEFINE CLANG35_AARCH64_TARGET = -target aarch64 > + > DEFINE CLANG35_WARNING_OVERRIDES = -Wno-parentheses-equality > -Wno-tautological-compare -Wno-tautological-constant-out-of-range-compare > -Wno-empty-body > -DEFINE CLANG35_ARM_CC_FLAGS = DEF(GCC_ARM_CC_FLAGS) -target armv7-a > -mstrict-align -mllvm -arm-use-movt=0 DEF(CLANG35_WARNING_OVERRIDES) > -DEFINE CLANG35_AARCH64_CC_FLAGS = DEF(GCC_AARCH64_CC_FLAGS) -target aarch64 > -mcmodel=small -mstrict-align DEF(CLANG35_WARNING_OVERRIDES) > +DEFINE CLANG35_ARM_CC_FLAGS = DEF(GCC_ARM_CC_FLAGS) > DEF(CLANG35_ARM_TARGET) -mstrict-align -mllvm -arm-use-movt=0 > DEF(CLANG35_WARNING_OVERRIDES) > +DEFINE CLANG35_AARCH64_CC_FLAGS = DEF(GCC_AARCH64_CC_FLAGS) > +DEF(CLANG35_AARCH64_TARGET) -mcmodel=small -mstrict-align > +DEF(CLANG35_WARNING_OVERRIDES) > > ################## > # CLANG35 ARM definitions > @@ -5197,11 +5200,11 @@ DEFINE CLANG35_AARCH64_CC_FLAGS = > DEF(GCC_AARCH64_CC_FLAGS) -target aarch64 -mc > > *_CLANG35_ARM_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) > *_CLANG35_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_ASLDLINK_FLAGS) > -*_CLANG35_ARM_ASM_FLAGS = DEF(GCC_ASM_FLAGS) $(ARCHASM_FLAGS) > $(PLATFORM_FLAGS) -target armv7-a -Qunused-arguments > +*_CLANG35_ARM_ASM_FLAGS = DEF(GCC_ASM_FLAGS) > DEF(CLANG35_ARM_TARGET) $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) -Qunused-arguments > *_CLANG35_ARM_DLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) > *_CLANG35_ARM_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) > --defsym=PECOFF_HEADER_SIZE=0x220 > *_CLANG35_ARM_PLATFORM_FLAGS = > -*_CLANG35_ARM_PP_FLAGS = DEF(GCC_PP_FLAGS) $(ARCHCC_FLAGS) > $(PLATFORM_FLAGS) > +*_CLANG35_ARM_PP_FLAGS = DEF(GCC_PP_FLAGS) DEF(CLANG35_ARM_TARGET) > $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > *_CLANG35_ARM_RC_FLAGS = DEF(GCC_ARM_RC_FLAGS) > *_CLANG35_ARM_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) $(ARCHCC_FLAGS) > $(PLATFORM_FLAGS) > > @@ -5218,11 +5221,11 @@ RELEASE_CLANG35_ARM_CC_FLAGS = > DEF(CLANG35_ARM_CC_FLAGS) $(ARCHCC_FLAGS) $(P > > *_CLANG35_AARCH64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) > *_CLANG35_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_ASLDLINK_FLAGS) > -*_CLANG35_AARCH64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) $(ARCHASM_FLAGS) > $(PLATFORM_FLAGS) -target aarch64 -Qunused-arguments > +*_CLANG35_AARCH64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) > DEF(CLANG35_AARCH64_TARGET) $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) > -Qunused-arguments > *_CLANG35_AARCH64_DLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -z > common-page-size=0x1000 > *_CLANG35_AARCH64_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) > --defsym=PECOFF_HEADER_SIZE=0x228 > *_CLANG35_AARCH64_PLATFORM_FLAGS = > -*_CLANG35_AARCH64_PP_FLAGS = DEF(GCC_PP_FLAGS) $(ARCHCC_FLAGS) > $(PLATFORM_FLAGS) > +*_CLANG35_AARCH64_PP_FLAGS = DEF(GCC_PP_FLAGS) > DEF(CLANG35_AARCH64_TARGET) $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) > *_CLANG35_AARCH64_RC_FLAGS = DEF(GCC_AARCH64_RC_FLAGS) > *_CLANG35_AARCH64_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) $(ARCHCC_FLAGS) > $(PLATFORM_FLAGS) > > -- > 2.5.0 > _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
