1 files changed, 8 insertions, 6 deletions
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index f854ab0de..89942cd35 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -4449,6 +4449,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS   = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
 *_GCC48_ARM_DLINK_FLAGS          = DEF(GCC48_ARM_DLINK_FLAGS)
 *_GCC48_ARM_PLATFORM_FLAGS       = -march=armv7-a
 *_GCC48_ARM_PP_FLAGS             = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)
+*_GCC48_ARM_ASLPP_FLAGS          = DEF(GCC_ASLPP_FLAGS) $(PLATFORM_FLAGS)
 *_GCC48_ARM_RC_FLAGS             = DEF(GCC_ARM_RC_FLAGS)
 *_GCC48_ARM_VFRPP_FLAGS          = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)
 
@@ -4475,6 +4476,7 @@ RELEASE_GCC48_ARM_CC_FLAGS       = DEF(GCC48_ARM_CC_FLAGS) -Wno-unused-but-set-v
 *_GCC48_AARCH64_DLINK_FLAGS      = DEF(GCC48_AARCH64_DLINK_FLAGS)
 *_GCC48_AARCH64_PLATFORM_FLAGS   =
 *_GCC48_AARCH64_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_PP_FLAGS)
+*_GCC48_AARCH64_ASLPP_FLAGS      = DEF(GCC_ASLPP_FLAGS) $(PLATFORM_FLAGS)
 *_GCC48_AARCH64_RC_FLAGS         = DEF(GCC_AARCH64_RC_FLAGS)
 *_GCC48_AARCH64_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_VFRPP_FLAGS)
 
@@ -6670,9 +6672,9 @@ RELEASE_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_F
 *_ARMGCC_*_ASL_PATH          = DEF(UNIX_IASL_BIN)
 *_ARMGCC_*_ASL_FLAGS         = DEF(IASL_FLAGS)
 *_ARMGCC_*_ASL_OUTFLAGS      = DEF(IASL_OUTFLAGS)
-*_ARMGCC_*_ASLPP_FLAGS       = -x c -E -P
-*_ARMGCC_*_ASLCC_FLAGS       = -x c
-*_ARMGCC_*_ASLDLINK_FLAGS    = DEF(GCC_DLINK_FLAGS_COMMON) --entry ReferenceAcpiTable
+*_ARMGCC_*_ASLPP_FLAGS       = DEF(GCC_ASLPP_FLAGS)
+*_ARMGCC_*_ASLCC_FLAGS       = DEF(GCC_ASLCC_FLAGS)
+*_ARMGCC_*_ASLDLINK_FLAGS    = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
 
 ##################
 # ARM definitions
@@ -6764,9 +6766,9 @@ RELEASE_ARMGCC_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_AARC
 *_ARMLINUXGCC_*_ASL_PATH           = DEF(UNIX_IASL_BIN)
 *_ARMLINUXGCC_*_ASL_FLAGS          = DEF(IASL_FLAGS)
 *_ARMLINUXGCC_*_ASL_OUTFLAGS       = DEF(IASL_OUTFLAGS)
-*_ARMLINUXGCC_*_ASLPP_FLAGS        = -x c -E -P
-*_ARMLINUXGCC_*_ASLCC_FLAGS        = -x c
-*_ARMLINUXGCC_*_ASLDLINK_FLAGS     = DEF(GCC_DLINK_FLAGS_COMMON) --entry ReferenceAcpiTable
+*_ARMLINUXGCC_*_ASLPP_FLAGS        = DEF(GCC_ASLPP_FLAGS)
+*_ARMLINUXGCC_*_ASLCC_FLAGS        = DEF(GCC_ASLCC_FLAGS)
+*_ARMLINUXGCC_*_ASLDLINK_FLAGS     = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS)
 
 ##################
 # ARM definitions