Use the same GCC options for assembling regardless of the exact
GCC version.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
---
 BaseTools/Conf/tools_def.template | 67 ++++++++------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/BaseTools/Conf/tools_def.template 
b/BaseTools/Conf/tools_def.template
index 18ae92623e1c..a21b44ffd413 100644
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -3845,7 +3845,13 @@ DEFINE GCC_AARCH64_DLINK2_FLAGS    = 
--defsym=PECOFF_HEADER_SIZE=0x228 DEF(GCC_A
 
 DEFINE GCC_IPF_OBJCOPY_FLAGS       = -I elf64-ia64-little -O efi-bsdrv-ia64
 DEFINE GCC_IPF_SYMRENAME_FLAGS     = --redefine-sym memcpy=CopyMem
+
 DEFINE GCC_ASM_FLAGS               = -c -x assembler -imacros 
$(DEST_DIR_DEBUG)/AutoGen.h
+DEFINE GCC_IA32_ASM_FLAGS          = DEF(GCC_ASM_FLAGS) -m32 -Wa,--32 
-march=i386
+DEFINE GCC_X64_ASM_FLAGS           = DEF(GCC_ASM_FLAGS) -m64 -Wa,--64
+DEFINE GCC_ARM_ASM_FLAGS           = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) 
DEF(GCC_ASM_FLAGS) -mlittle-endian
+DEFINE GCC_AARCH64_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) 
DEF(GCC_ASM_FLAGS) -mlittle-endian
+
 DEFINE GCC_PP_FLAGS                = -E -x assembler-with-cpp -include 
$(DEST_DIR_DEBUG)/AutoGen.h
 DEFINE GCC_VFRPP_FLAGS             = -x c -E -P -DVFRCOMPILE --include 
$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 DEFINE GCC_ASLPP_FLAGS             = -x c -E -P
@@ -3856,25 +3862,6 @@ DEFINE GCC_IPF_RC_FLAGS            = -I binary -O 
elf64-ia64-little   -B ia64
 DEFINE GCC_ARM_RC_FLAGS            = -I binary -O elf32-littlearm     -B arm   
  --rename-section .data=.hii
 DEFINE GCC_AARCH64_RC_FLAGS        = -I binary -O elf64-littleaarch64 -B 
aarch64 --rename-section .data=.hii
 
-DEFINE GCC44_ASM_FLAGS               = DEF(GCC_ASM_FLAGS)
-
-DEFINE GCC45_ASM_FLAGS               = DEF(GCC44_ASM_FLAGS)
-
-DEFINE GCC46_ASM_FLAGS               = DEF(GCC45_ASM_FLAGS)
-DEFINE GCC46_ARM_ASM_FLAGS           = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) 
DEF(GCC_ASM_FLAGS) -mlittle-endian
-
-DEFINE GCC47_ASM_FLAGS               = DEF(GCC46_ASM_FLAGS)
-DEFINE GCC47_ARM_ASM_FLAGS           = DEF(GCC46_ARM_ASM_FLAGS)
-DEFINE GCC47_AARCH64_ASM_FLAGS       = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) 
DEF(GCC_ASM_FLAGS) -mlittle-endian
-
-DEFINE GCC48_ASM_FLAGS               = DEF(GCC47_ASM_FLAGS)
-DEFINE GCC48_ARM_ASM_FLAGS           = DEF(GCC47_ARM_ASM_FLAGS)
-DEFINE GCC48_AARCH64_ASM_FLAGS       = DEF(GCC47_AARCH64_ASM_FLAGS)
-
-DEFINE GCC49_ASM_FLAGS               = DEF(GCC48_ASM_FLAGS)
-DEFINE GCC49_ARM_ASM_FLAGS           = DEF(GCC48_ARM_ASM_FLAGS)
-DEFINE GCC49_AARCH64_ASM_FLAGS       = DEF(GCC48_AARCH64_ASM_FLAGS)
-
 
####################################################################################
 #
 # Unix GCC And Intel Linux ACPI Compiler
@@ -4000,7 +3987,7 @@ DEFINE GCC49_AARCH64_ASM_FLAGS       = 
DEF(GCC48_AARCH64_ASM_FLAGS)
 
 *_GCC44_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32
 *_GCC44_IA32_ASLDLINK_FLAGS       = DEF(GCC_IA32_ASLDLINK_ELF_FLAGS)
-*_GCC44_IA32_ASM_FLAGS            = DEF(GCC44_ASM_FLAGS) -m32 --32 -march=i386
+*_GCC44_IA32_ASM_FLAGS            = DEF(GCC_IA32_ASM_FLAGS)
 *_GCC44_IA32_CC_FLAGS             = DEF(GCC_IA32_CC_ELF_FLAGS) -Os
 *_GCC44_IA32_DLINK_FLAGS          = DEF(GCC_IA32_DLINK_ELF_FLAGS)
 *_GCC44_IA32_DLINK2_FLAGS         = DEF(GCC_IA32_DLINK2_FLAGS)
@@ -4025,7 +4012,7 @@ DEFINE GCC49_AARCH64_ASM_FLAGS       = 
DEF(GCC48_AARCH64_ASM_FLAGS)
 
 *_GCC44_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64
 *_GCC44_X64_ASLDLINK_FLAGS       = DEF(GCC_X64_ASLDLINK_ELF_FLAGS)
-*_GCC44_X64_ASM_FLAGS            = DEF(GCC44_ASM_FLAGS) -m64 --64 -melf_x86_64
+*_GCC44_X64_ASM_FLAGS            = DEF(GCC_X64_ASM_FLAGS) -melf_x86_64
 *_GCC44_X64_CC_FLAGS             = DEF(GCC_X64_CC_ELF_FLAGS)
 *_GCC44_X64_DLINK_FLAGS          = DEF(GCC_X64_DLINK_ELF_FLAGS)
 *_GCC44_X64_DLINK2_FLAGS         = DEF(GCC_X64_DLINK2_FLAGS)
@@ -4070,7 +4057,7 @@ DEFINE GCC49_AARCH64_ASM_FLAGS       = 
DEF(GCC48_AARCH64_ASM_FLAGS)
 
 *_GCC45_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32
 *_GCC45_IA32_ASLDLINK_FLAGS       = DEF(GCC_IA32_ASLDLINK_ELF_FLAGS)
-*_GCC45_IA32_ASM_FLAGS            = DEF(GCC45_ASM_FLAGS) -m32 --32 -march=i386
+*_GCC45_IA32_ASM_FLAGS            = DEF(GCC_IA32_ASM_FLAGS)
 *_GCC45_IA32_CC_FLAGS             = DEF(GCC_IA32_CC_ELF_FLAGS) -Os
 *_GCC45_IA32_DLINK_FLAGS          = DEF(GCC_IA32_DLINK_ELF_FLAGS)
 *_GCC45_IA32_DLINK2_FLAGS         = DEF(GCC_IA32_DLINK2_FLAGS)
@@ -4095,7 +4082,7 @@ DEFINE GCC49_AARCH64_ASM_FLAGS       = 
DEF(GCC48_AARCH64_ASM_FLAGS)
 
 *_GCC45_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64
 *_GCC45_X64_ASLDLINK_FLAGS       = DEF(GCC_X64_ASLDLINK_ELF_FLAGS)
-*_GCC45_X64_ASM_FLAGS            = DEF(GCC45_ASM_FLAGS) -m64 --64 -melf_x86_64
+*_GCC45_X64_ASM_FLAGS            = DEF(GCC_X64_ASM_FLAGS) -melf_x86_64
 *_GCC45_X64_CC_FLAGS             = DEF(GCC_X64_CC_ELF_FLAGS)
 *_GCC45_X64_DLINK_FLAGS          = DEF(GCC_X64_DLINK_ELF_FLAGS)
 *_GCC45_X64_DLINK2_FLAGS         = DEF(GCC_X64_DLINK2_FLAGS)
@@ -4140,7 +4127,7 @@ DEFINE GCC49_AARCH64_ASM_FLAGS       = 
DEF(GCC48_AARCH64_ASM_FLAGS)
 
 *_GCC46_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32
 *_GCC46_IA32_ASLDLINK_FLAGS       = DEF(GCC_IA32_ASLDLINK_ELF_FLAGS)
-*_GCC46_IA32_ASM_FLAGS            = DEF(GCC46_ASM_FLAGS) -m32 -march=i386
+*_GCC46_IA32_ASM_FLAGS            = DEF(GCC_IA32_ASM_FLAGS)
 *_GCC46_IA32_CC_FLAGS             = DEF(GCC_IA32_CC_ELF_FLAGS) -Os
 *_GCC46_IA32_DLINK_FLAGS          = DEF(GCC_IA32_DLINK_ELF_FLAGS)
 *_GCC46_IA32_DLINK2_FLAGS         = DEF(GCC_IA32_DLINK2_FLAGS)
@@ -4165,7 +4152,7 @@ DEFINE GCC49_AARCH64_ASM_FLAGS       = 
DEF(GCC48_AARCH64_ASM_FLAGS)
 
 *_GCC46_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64
 *_GCC46_X64_ASLDLINK_FLAGS       = DEF(GCC_X64_ASLDLINK_ELF_FLAGS)
-*_GCC46_X64_ASM_FLAGS            = DEF(GCC46_ASM_FLAGS) -m64 -melf_x86_64
+*_GCC46_X64_ASM_FLAGS            = DEF(GCC_X64_ASM_FLAGS) -melf_x86_64
 *_GCC46_X64_CC_FLAGS             = DEF(GCC_X64_CC_ELF_FLAGS)
 *_GCC46_X64_DLINK_FLAGS          = DEF(GCC_X64_DLINK_ELF_FLAGS)
 *_GCC46_X64_DLINK2_FLAGS         = DEF(GCC_X64_DLINK2_FLAGS)
@@ -4193,7 +4180,7 @@ DEFINE GCC49_AARCH64_ASM_FLAGS       = 
DEF(GCC48_AARCH64_ASM_FLAGS)
 
 *_GCC46_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)
 *_GCC46_ARM_ASLDLINK_FLAGS       = DEF(GCC_ARM_ASLDLINK_FLAGS)
-*_GCC46_ARM_ASM_FLAGS            = DEF(GCC46_ARM_ASM_FLAGS)
+*_GCC46_ARM_ASM_FLAGS            = DEF(GCC_ARM_ASM_FLAGS)
 *_GCC46_ARM_DLINK_FLAGS          = DEF(GCC_ARM_DLINK_FLAGS)
 *_GCC46_ARM_PLATFORM_FLAGS       = -march=armv7-a
 *_GCC46_ARM_PP_FLAGS             = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) 
DEF(GCC_PP_FLAGS)
@@ -4240,7 +4227,7 @@ RELEASE_GCC46_ARM_CC_FLAGS       = DEF(GCC_ARM_CC_FLAGS) 
-D__ARM_FEATURE_UNALIGN
 
 *_GCC47_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32
 *_GCC47_IA32_ASLDLINK_FLAGS       = DEF(GCC_IA32_ASLDLINK_ELF_FLAGS)
-*_GCC47_IA32_ASM_FLAGS            = DEF(GCC47_ASM_FLAGS) -m32 -march=i386
+*_GCC47_IA32_ASM_FLAGS            = DEF(GCC_IA32_ASM_FLAGS)
 *_GCC47_IA32_CC_FLAGS             = DEF(GCC_IA32_CC_ELF_FLAGS) -Os
 *_GCC47_IA32_DLINK_FLAGS          = DEF(GCC_IA32_DLINK_ELF_FLAGS)
 *_GCC47_IA32_DLINK2_FLAGS         = DEF(GCC_IA32_DLINK2_FLAGS)
@@ -4265,7 +4252,7 @@ RELEASE_GCC46_ARM_CC_FLAGS       = DEF(GCC_ARM_CC_FLAGS) 
-D__ARM_FEATURE_UNALIGN
 
 *_GCC47_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64
 *_GCC47_X64_ASLDLINK_FLAGS       = DEF(GCC_X64_ASLDLINK_ELF_FLAGS)
-*_GCC47_X64_ASM_FLAGS            = DEF(GCC47_ASM_FLAGS) -m64
+*_GCC47_X64_ASM_FLAGS            = DEF(GCC_X64_ASM_FLAGS)
 *_GCC47_X64_CC_FLAGS             = DEF(GCC_X64_CC_ELF_FLAGS)
 *_GCC47_X64_DLINK_FLAGS          = DEF(GCC_X64_DLINK_ELF_FLAGS)
 *_GCC47_X64_DLINK2_FLAGS         = DEF(GCC_X64_DLINK2_FLAGS)
@@ -4292,7 +4279,7 @@ RELEASE_GCC46_ARM_CC_FLAGS       = DEF(GCC_ARM_CC_FLAGS) 
-D__ARM_FEATURE_UNALIGN
 
 *_GCC47_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)
 *_GCC47_ARM_ASLDLINK_FLAGS       = DEF(GCC_ARM_ASLDLINK_FLAGS)
-*_GCC47_ARM_ASM_FLAGS            = DEF(GCC47_ARM_ASM_FLAGS)
+*_GCC47_ARM_ASM_FLAGS            = DEF(GCC_ARM_ASM_FLAGS)
 *_GCC47_ARM_DLINK_FLAGS          = DEF(GCC_ARM_DLINK_FLAGS)
 *_GCC47_ARM_PLATFORM_FLAGS       = -march=armv7-a
 *_GCC47_ARM_PP_FLAGS             = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) 
DEF(GCC_PP_FLAGS)
@@ -4318,7 +4305,7 @@ RELEASE_GCC47_ARM_CC_FLAGS       = DEF(GCC_ARM_CC_FLAGS) 
-mno-unaligned-access
 
 *_GCC47_AARCH64_ASLCC_FLAGS      = DEF(GCC_ASLCC_FLAGS)
 *_GCC47_AARCH64_ASLDLINK_FLAGS   = DEF(GCC_AARCH64_ASLDLINK_FLAGS)
-*_GCC47_AARCH64_ASM_FLAGS        = DEF(GCC47_AARCH64_ASM_FLAGS)
+*_GCC47_AARCH64_ASM_FLAGS        = DEF(GCC_AARCH64_ASM_FLAGS)
 *_GCC47_AARCH64_DLINK_FLAGS      = DEF(GCC_AARCH64_DLINK_FLAGS)
 *_GCC47_AARCH64_DLINK2_FLAGS     = DEF(GCC_AARCH64_DLINK2_FLAGS)
 *_GCC47_AARCH64_PLATFORM_FLAGS   =
@@ -4366,7 +4353,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS   = 
DEF(GCC_AARCH64_CC_FLAGS)
 
 *_GCC48_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32
 *_GCC48_IA32_ASLDLINK_FLAGS       = DEF(GCC_IA32_ASLDLINK_ELF_FLAGS)
-*_GCC48_IA32_ASM_FLAGS            = DEF(GCC48_ASM_FLAGS) -m32 -march=i386
+*_GCC48_IA32_ASM_FLAGS            = DEF(GCC_IA32_ASM_FLAGS)
 *_GCC48_IA32_CC_FLAGS             = DEF(GCC_IA32_CC_ELF_FLAGS) -Os
 *_GCC48_IA32_DLINK_FLAGS          = DEF(GCC_IA32_DLINK_ELF_FLAGS)
 *_GCC48_IA32_DLINK2_FLAGS         = DEF(GCC_IA32_DLINK2_FLAGS)
@@ -4391,7 +4378,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS   = 
DEF(GCC_AARCH64_CC_FLAGS)
 
 *_GCC48_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64
 *_GCC48_X64_ASLDLINK_FLAGS       = DEF(GCC_X64_ASLDLINK_ELF_FLAGS)
-*_GCC48_X64_ASM_FLAGS            = DEF(GCC48_ASM_FLAGS) -m64
+*_GCC48_X64_ASM_FLAGS            = DEF(GCC_X64_ASM_FLAGS)
 *_GCC48_X64_CC_FLAGS             = DEF(GCC_X64_CC_ELF_FLAGS)
 *_GCC48_X64_DLINK_FLAGS          = DEF(GCC_X64_DLINK_ELF_FLAGS)
 *_GCC48_X64_DLINK2_FLAGS         = DEF(GCC_X64_DLINK2_FLAGS)
@@ -4418,7 +4405,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS   = 
DEF(GCC_AARCH64_CC_FLAGS)
 
 *_GCC48_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)
 *_GCC48_ARM_ASLDLINK_FLAGS       = DEF(GCC_ARM_ASLDLINK_FLAGS)
-*_GCC48_ARM_ASM_FLAGS            = DEF(GCC48_ARM_ASM_FLAGS)
+*_GCC48_ARM_ASM_FLAGS            = DEF(GCC_ARM_ASM_FLAGS)
 *_GCC48_ARM_DLINK_FLAGS          = DEF(GCC_ARM_DLINK_FLAGS)
 *_GCC48_ARM_PLATFORM_FLAGS       = -march=armv7-a
 *_GCC48_ARM_PP_FLAGS             = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) 
DEF(GCC_PP_FLAGS)
@@ -4444,7 +4431,7 @@ RELEASE_GCC48_ARM_CC_FLAGS       = DEF(GCC_ARM_CC_FLAGS) 
-mno-unaligned-access
 
 *_GCC48_AARCH64_ASLCC_FLAGS      = DEF(GCC_ASLCC_FLAGS)
 *_GCC48_AARCH64_ASLDLINK_FLAGS   = DEF(GCC_AARCH64_ASLDLINK_FLAGS)
-*_GCC48_AARCH64_ASM_FLAGS        = DEF(GCC48_AARCH64_ASM_FLAGS)
+*_GCC48_AARCH64_ASM_FLAGS        = DEF(GCC_AARCH64_ASM_FLAGS)
 *_GCC48_AARCH64_DLINK_FLAGS      = DEF(GCC_AARCH64_DLINK_FLAGS)
 *_GCC48_AARCH64_DLINK2_FLAGS     = DEF(GCC_AARCH64_DLINK2_FLAGS)
 *_GCC48_AARCH64_PLATFORM_FLAGS   =
@@ -4492,7 +4479,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = 
DEF(GCC_AARCH64_CC_FLAGS)
 
 *_GCC49_IA32_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m32
 *_GCC49_IA32_ASLDLINK_FLAGS       = DEF(GCC_IA32_ASLDLINK_ELF_FLAGS)
-*_GCC49_IA32_ASM_FLAGS            = DEF(GCC49_ASM_FLAGS) -m32 -march=i386
+*_GCC49_IA32_ASM_FLAGS            = DEF(GCC_IA32_ASM_FLAGS)
 *_GCC49_IA32_CC_FLAGS             = DEF(GCC_IA32_CC_ELF_FLAGS) -Os
 *_GCC49_IA32_DLINK_FLAGS          = DEF(GCC_IA32_DLINK_ELF_FLAGS)
 *_GCC49_IA32_DLINK2_FLAGS         = DEF(GCC_IA32_DLINK2_FLAGS)
@@ -4517,7 +4504,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = 
DEF(GCC_AARCH64_CC_FLAGS)
 
 *_GCC49_X64_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS) -m64
 *_GCC49_X64_ASLDLINK_FLAGS       = DEF(GCC_X64_ASLDLINK_ELF_FLAGS)
-*_GCC49_X64_ASM_FLAGS            = DEF(GCC49_ASM_FLAGS) -m64
+*_GCC49_X64_ASM_FLAGS            = DEF(GCC_X64_ASM_FLAGS)
 *_GCC49_X64_CC_FLAGS             = DEF(GCC_X64_CC_ELF_FLAGS)
 *_GCC49_X64_DLINK_FLAGS          = DEF(GCC_X64_DLINK_ELF_FLAGS)
 *_GCC49_X64_DLINK2_FLAGS         = DEF(GCC_X64_DLINK2_FLAGS)
@@ -4544,7 +4531,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS   = 
DEF(GCC_AARCH64_CC_FLAGS)
 
 *_GCC49_ARM_ASLCC_FLAGS          = DEF(GCC_ASLCC_FLAGS)
 *_GCC49_ARM_ASLDLINK_FLAGS       = DEF(GCC_ARM_ASLDLINK_FLAGS)
-*_GCC49_ARM_ASM_FLAGS            = DEF(GCC49_ARM_ASM_FLAGS)
+*_GCC49_ARM_ASM_FLAGS            = DEF(GCC_ARM_ASM_FLAGS)
 *_GCC49_ARM_DLINK_FLAGS          = DEF(GCC_ARM_DLINK_FLAGS)
 *_GCC49_ARM_PLATFORM_FLAGS       = -march=armv7-a
 *_GCC49_ARM_PP_FLAGS             = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) 
DEF(GCC_PP_FLAGS)
@@ -4570,7 +4557,7 @@ RELEASE_GCC49_ARM_CC_FLAGS       = DEF(GCC_ARM_CC_FLAGS) 
-mno-unaligned-access
 
 *_GCC49_AARCH64_ASLCC_FLAGS      = DEF(GCC_ASLCC_FLAGS)
 *_GCC49_AARCH64_ASLDLINK_FLAGS   = DEF(GCC_AARCH64_ASLDLINK_FLAGS)
-*_GCC49_AARCH64_ASM_FLAGS        = DEF(GCC49_AARCH64_ASM_FLAGS)
+*_GCC49_AARCH64_ASM_FLAGS        = DEF(GCC_AARCH64_ASM_FLAGS)
 *_GCC49_AARCH64_DLINK_FLAGS      = DEF(GCC_AARCH64_DLINK_FLAGS)
 *_GCC49_AARCH64_DLINK2_FLAGS     = DEF(GCC_AARCH64_DLINK2_FLAGS)
 *_GCC49_AARCH64_PLATFORM_FLAGS   =
@@ -4885,7 +4872,7 @@ RELEASE_CLANG35_AARCH64_CC_FLAGS = 
DEF(CLANG35_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS)
 *_ELFGCC_IA32_DLINK_FLAGS           = DEF(GCC_IA32_DLINK_ELF_FLAGS)
 *_ELFGCC_IA32_DLINK2_FLAGS          = DEF(GCC_IA32_DLINK2_FLAGS)
 *_ELFGCC_IA32_ASLDLINK_FLAGS        = DEF(GCC_IA32_ASLDLINK_ELF_FLAGS)
-*_ELFGCC_IA32_ASM_FLAGS             = -m32 -c -x assembler -imacros 
$(DEST_DIR_DEBUG)/AutoGen.h
+*_ELFGCC_IA32_ASM_FLAGS             = DEF(GCC_IA32_ASM_FLAGS)
 *_ELFGCC_IA32_PP_FLAGS              = -m32 -E -x assembler-with-cpp -include 
$(DEST_DIR_DEBUG)/AutoGen.h
 *_ELFGCC_IA32_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include 
$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 *_ELFGCC_IA32_RC_FLAGS              = DEF(GCC_IA32_RC_FLAGS)
@@ -4911,7 +4898,7 @@ RELEASE_CLANG35_AARCH64_CC_FLAGS = 
DEF(CLANG35_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS)
 *_ELFGCC_X64_DLINK_FLAGS           = DEF(GCC_X64_DLINK_ELF_FLAGS)
 *_ELFGCC_X64_DLINK2_FLAGS          = DEF(GCC_X64_DLINK2_FLAGS)
 *_ELFGCC_X64_ASLDLINK_FLAGS        = DEF(GCC_X64_ASLDLINK_ELF_FLAGS)
-*_ELFGCC_X64_ASM_FLAGS             = -c -x assembler -imacros 
$(DEST_DIR_DEBUG)/AutoGen.h
+*_ELFGCC_X64_ASM_FLAGS             = DEF(GCC_X64_ASM_FLAGS)
 *_ELFGCC_X64_PP_FLAGS              = -E -x assembler-with-cpp -include 
$(DEST_DIR_DEBUG)/AutoGen.h
 *_ELFGCC_X64_VFRPP_FLAGS           = -x c -E -P -DVFRCOMPILE --include 
$(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h
 *_ELFGCC_X64_RC_FLAGS              = DEF(GCC_X64_RC_FLAGS)
-- 
1.9.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to