This aligns the remaining configuration options for ELFGCC with the other ELF based toolchains.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> --- BaseTools/Conf/tools_def.template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 38f7996d57d7..fabfe7436167 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -4873,8 +4873,8 @@ RELEASE_CLANG35_AARCH64_CC_FLAGS = DEF(CLANG35_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS) *_ELFGCC_IA32_DLINK2_FLAGS = DEF(GCC_IA32_DLINK2_FLAGS) *_ELFGCC_IA32_ASLDLINK_FLAGS = DEF(GCC_IA32_ASLDLINK_ELF_FLAGS) *_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_PP_FLAGS = DEF(GCC_PP_FLAGS) +*_ELFGCC_IA32_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) *_ELFGCC_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) *_ELFGCC_IA32_OBJCOPY_FLAGS = *_ELFGCC_IA32_NASM_FLAGS = -f elf32 @@ -4899,8 +4899,8 @@ RELEASE_CLANG35_AARCH64_CC_FLAGS = DEF(CLANG35_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS) *_ELFGCC_X64_DLINK2_FLAGS = DEF(GCC_X64_DLINK2_FLAGS) *_ELFGCC_X64_ASLDLINK_FLAGS = DEF(GCC_X64_ASLDLINK_ELF_FLAGS) *_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_PP_FLAGS = DEF(GCC_PP_FLAGS) +*_ELFGCC_X64_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) *_ELFGCC_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) *_ELFGCC_X64_NASM_FLAGS = -f elf64 @@ -4918,12 +4918,12 @@ RELEASE_CLANG35_AARCH64_CC_FLAGS = DEF(CLANG35_AARCH64_CC_FLAGS) $(ARCHCC_FLAGS) *_ELFGCC_IPF_VFRPP_PATH = DEF(ELFGCC_BIN)/gcc *_ELFGCC_IPF_RC_PATH = DEF(ELFGCC_BIN)/objcopy -*_ELFGCC_IPF_CC_FLAGS = -Os -fshort-wchar -Wall -Werror -c -include AutoGen.h -D_EFI_P64 -*_ELFGCC_IPF_DLINK_FLAGS = -nostdlib --shared --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map +*_ELFGCC_IPF_CC_FLAGS = DEF(GCC_IPF_CC_FLAGS) *_ELFGCC_IPF_SLINK_FLAGS = -*_ELFGCC_IPF_ASM_FLAGS = -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h -*_ELFGCC_IPF_PP_FLAGS = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h -*_ELFGCC_IPF_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h +*_ELFGCC_IPF_DLINK_FLAGS = DEF(GCC_IPF_DLINK_FLAGS) +*_ELFGCC_IPF_ASM_FLAGS = DEF(GCC_ASM_FLAGS) +*_ELFGCC_IPF_PP_FLAGS = DEF(GCC_PP_FLAGS) +*_ELFGCC_IPF_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS) *_ELFGCC_IPF_RC_FLAGS = DEF(GCC_IPF_RC_FLAGS) #################################################################################### -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
