BaseTools: Update tools_def.template to remove old XCLANG and XCODE32

https://bugzilla.tianocore.org/show_bug.cgi?id=562
https://bugzilla.tianocore.org/show_bug.cgi?id=563

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Andrew Fish <afish@apple.com>

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 65f21061e680d1b0afb2dd5f9d4922d292ae9828..7d3f54218461d1cb5620b797d52538368643f01a 100755 (executable)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -7251,182 +7251,6 @@ NOOPT_MYTOOLS_IPF_DLINK_FLAGS            = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT
 *_MYTOOLS_EBC_DLINK_FLAGS                = "C:\Program Files\Intel\EBC\Lib\EbcLib.lib" /NOLOGO /NODEFAULTLIB /MACHINE:EBC /OPT:REF /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /MAP /ALIGN:32 /DRIVER\r
 \r
 \r
-####################################################################################\r
-#\r
-# Xcode Support for building on Mac OS X (Snow Leopard)\r
-#\r
-####################################################################################\r
-#   XCODE32         - Xcode 3.2 Tools (Snow Leopard)\r
-*_XCODE32_*_*_FAMILY            = GCC\r
-*_XCODE32_*_*_BUILDRULEFAMILY   = XCODE\r
-*_XCODE32_*_*_BUILDRULEORDER    = S s nasm\r
-\r
-\r
-*_XCODE32_*_ASL_PATH          = /usr/bin/iasl\r
-\r
-*_XCODE32_*_MAKE_PATH        = make\r
-\r
-*_XCODE32_*_DSYMUTIL_PATH    = /usr/bin/dsymutil\r
-\r
-# This tool needs to be installed seperatly from Xcode 3.2\r
-*_XCODE32_*_MTOC_PATH        = /usr/local/bin/mtoc\r
-\r
-  DEBUG_XCODE32_*_MTOC_FLAGS = -align 0x20 -d $(DEBUG_DIR)/$(MODULE_NAME).dll\r
-RELEASE_XCODE32_*_MTOC_FLAGS = -align 0x20\r
-\r
-##################\r
-# IA32 definitions\r
-##################\r
-*_XCODE32_IA32_CC_PATH      = gcc\r
-*_XCODE32_IA32_SLINK_PATH   = libtool\r
-*_XCODE32_IA32_DLINK_PATH   = ld\r
-*_XCODE32_IA32_ASM_PATH     = as\r
-*_XCODE32_IA32_PP_PATH      = gcc\r
-*_XCODE32_IA32_VFRPP_PATH   = gcc\r
-*_XCODE32_IA32_ASL_PATH     = iasl\r
-*_XCODE32_IA32_ASLCC_PATH   = gcc\r
-*_XCODE32_IA32_ASLPP_PATH   = gcc\r
-*_XCODE32_IA32_ASLDLINK_PATH  = ld\r
-\r
-  DEBUG_XCODE32_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20  -pie -all_load -dead_strip -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-RELEASE_XCODE32_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20  -pie -all_load -dead_strip -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-*_XCODE32_IA32_SLINK_FLAGS      = -static -o\r
-  DEBUG_XCODE32_IA32_ASM_FLAGS  = -arch i386 -g\r
-RELEASE_XCODE32_IA32_ASM_FLAGS  = -arch i386\r
-*_XCODE32_IA32_NASM_FLAGS       = -f macho32\r
-*_XCODE32_IA32_PP_FLAGS         = -arch i386 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-*_XCODE32_IA32_VFRPP_FLAGS      = -arch i386 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-  DEBUG_XCODE32_IA32_CC_FLAGS   = -arch i386 -save-temps -g -O0 -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces  -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector\r
-RELEASE_XCODE32_IA32_CC_FLAGS   = -arch i386 -Oz -combine -mms-bitfields  -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h -mdynamic-no-pic -fno-stack-protector\r
-\r
-*_XCODE32_IA32_ASLCC_FLAGS      = -arch i386 -x c -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic\r
-*_XCODE32_IA32_ASLDLINK_FLAGS   = -arch i386 -e _main -preload -segalign 0x20  -pie -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-*_XCODE32_IA32_ASLPP_FLAGS      = -arch i386 -x c -E -include AutoGen.h\r
-*_XCODE32_IA32_ASL_FLAGS        =\r
-\r
-##################\r
-# X64 definitions - still a work in progress. This tool chain does not produce\r
-# the correct ABI, it is just used to compile the code....\r
-##################\r
-*_XCODE32_X64_CC_PATH       = gcc\r
-*_XCODE32_X64_SLINK_PATH    = libtool\r
-*_XCODE32_X64_DLINK_PATH    = ld\r
-*_XCODE32_X64_ASM_PATH      = as\r
-*_XCODE32_X64_PP_PATH       = gcc\r
-*_XCODE32_X64_VFRPP_PATH    = gcc\r
-*_XCODE32_X64_ASL_PATH     = iasl\r
-*_XCODE32_X64_ASLCC_PATH   = gcc\r
-*_XCODE32_X64_ASLPP_PATH   = gcc\r
-*_XCODE32_X64_ASLDLINK_PATH  = ld\r
-\r
-*_XCODE32_X64_DLINK_FLAGS      = -arch x86_64 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-*_XCODE32_X64_SLINK_FLAGS      = -static -o\r
-\r
-  DEBUG_XCODE32_X64_ASM_FLAGS  = -arch x86_64 -g\r
-RELEASE_XCODE32_X64_ASM_FLAGS  = -arch x86_64\r
-*_XCODE32_X64_NASM_FLAGS       = -f macho64\r
-*_XCODE32_X64_PP_FLAGS         = -arch x86_64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-*_XCODE32_X64_VFRPP_FLAGS      = -arch x86_64 -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-\r
-  DEBUG_XCODE32_X64_CC_FLAGS   = -arch x86_64 -save-temps -g -O0 -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector\r
-RELEASE_XCODE32_X64_CC_FLAGS   = -arch x86_64 -Oz -mms-bitfields -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -Wno-address  -fomit-frame-pointer -static  -c -include AutoGen.h -fno-stack-protector\r
-\r
-##################\r
-# ARM definitions - (Assumes iPhone SDK installed on Snow Leopard)\r
-##################\r
-\r
-*_XCODE32_ARM_ARCHCC_FLAGS    = -arch armv7 -march=armv7 -mthumb\r
-*_XCODE32_ARM_ARCHASM_FLAGS   = -arch armv7\r
-*_XCODE32_ARM_ARCHDLINK_FLAGS = -arch armv7\r
-*_XCODE32_ARM_PLATFORM_FLAGS  =\r
-\r
-*_XCODE32_ARM_CC_PATH       = DEF(IPHONE_TOOLS)/usr/bin/gcc\r
-*_XCODE32_ARM_SLINK_PATH    = DEF(IPHONE_TOOLS)/usr/bin/libtool\r
-*_XCODE32_ARM_DLINK_PATH    = ld\r
-*_XCODE32_ARM_ASM_PATH      = DEF(IPHONE_TOOLS)/usr/bin/as\r
-*_XCODE32_ARM_PP_PATH       = DEF(IPHONE_TOOLS)/usr/bin/gcc\r
-*_XCODE32_ARM_VFRPP_PATH    = DEF(IPHONE_TOOLS)/usr/bin/gcc\r
-\r
-  DEBUG_XCODE32_ARM_DLINK_FLAGS      = $(ARCHDLINK_FLAGS) -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20  -pie -all_load -dead_strip -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-RELEASE_XCODE32_ARM_DLINK_FLAGS      = $(ARCHDLINK_FLAGS) -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20  -pie -all_load -dead_strip -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-\r
-*_XCODE32_ARM_SLINK_FLAGS      = -static -o\r
-\r
-  DEBUG_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS) -g\r
-RELEASE_XCODE32_ARM_ASM_FLAGS  = $(ARCHASM_FLAGS)\r
-*_XCODE32_ARM_PP_FLAGS         = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
-*_XCODE32_ARM_VFRPP_FLAGS      = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -x c -E -P -DVFRCOMPILE --include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h\r
-\r
-  DEBUG_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -g -Oz -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
-RELEASE_XCODE32_ARM_CC_FLAGS   = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mthumb-interwork -Oz    -mabi=aapcs -mapcs -fno-short-enums  -save-temps -combine -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -fomit-frame-pointer -c -include AutoGen.h\r
-\r
-\r
-####################################################################################\r
-#\r
-# Clang Support for building on Mac OS X\r
-#\r
-####################################################################################\r
-#   CLANG         - clang that produce Mach-O with EFI x86_64 ABI\r
-*_XCLANG_*_*_FAMILY            = GCC\r
-*_XCLANG_*_*_BUILDRULEFAMILY   = XCODE\r
-*_XCLANG_*_*_BUILDRULEORDER    = S s nasm\r
-\r
-*_XCLANG_*_ASL_PATH          = /usr/bin/iasl\r
-\r
-*_XCLANG_*_MAKE_PATH        = make\r
-*_XCLANG_*_DSYMUTIL_PATH    = /usr/bin/dsymutil\r
-\r
-      *_*_*_MTOC_PATH  = /usr/local/bin/mtoc\r
-\r
-  DEBUG_XCLANG_*_MTOC_FLAGS = -align 0x20 -d $(DEBUG_DIR)/$(MODULE_NAME).dll\r
-RELEASE_XCLANG_*_MTOC_FLAGS = -align 0x20\r
-\r
-\r
-*_XCLANG_*_CC_PATH      = ENV(CLANG_BIN)clang\r
-*_XCLANG_*_SLINK_PATH   = libtool\r
-*_XCLANG_*_DLINK_PATH   = ld\r
-*_XCLANG_*_ASM_PATH     = as\r
-*_XCLANG_*_PP_PATH      = ENV(CLANG_BIN)clang\r
-*_XCLANG_*_VFRPP_PATH   = ENV(CLANG_BIN)clang\r
-*_XCLANG_*_ASL_PATH     = iasl\r
-*_XCLANG_*_ASLCC_PATH   = ENV(CLANG_BIN)clang\r
-*_XCLANG_*_ASLPP_PATH   = ENV(CLANG_BIN)clang\r
-*_XCLANG_*_ASLDLINK_PATH  = ld\r
-\r
-####################\r
-# IA-32 definitions\r
-####################\r
-  DEBUG_XCLANG_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20  -pie -all_load -dead_strip -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-RELEASE_XCLANG_IA32_DLINK_FLAGS      = -arch i386 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20  -pie -all_load -dead_strip -seg1addr 0x220 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-*_XCLANG_IA32_SLINK_FLAGS      = -static -o\r
-  DEBUG_XCLANG_IA32_ASM_FLAGS  = -arch i386 -g\r
-RELEASE_XCLANG_IA32_ASM_FLAGS  = -arch i386 \r
-*_XCLANG_IA32_NASM_FLAGS       = -f macho32\r
-\r
-  DEBUG_XCLANG_IA32_CC_FLAGS   = -arch i386 -c -g -O0  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang\r
-RELEASE_XCLANG_IA32_CC_FLAGS   = -arch i386 -c    -Os  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -mno-sse -mno-mmx -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable  -fasm-blocks  -mms-bitfields -msoft-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang\r
-\r
-\r
-##################\r
-# X64 definitions\r
-##################\r
-  DEBUG_XCLANG_X64_DLINK_FLAGS      = -arch x86_64 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20  -pie -all_load -dead_strip -seg1addr 0x240 -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-RELEASE_XCLANG_X64_DLINK_FLAGS      = -arch x86_64 -u _$(IMAGE_ENTRY_POINT) -e _$(IMAGE_ENTRY_POINT) -preload -segalign 0x20  -pie -all_load -dead_strip -seg1addr 0x220 -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-*_XCLANG_X64_SLINK_FLAGS      = -static -o\r
-  DEBUG_XCLANG_X64_ASM_FLAGS  = -arch x86_64 -g\r
-RELEASE_XCLANG_X64_ASM_FLAGS  = -arch x86_64 \r
-*_XCLANG_X64_NASM_FLAGS       = -f macho64\r
-*_XCLANG_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h \r
-*_XCLANG_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h \r
-\r
-\r
-  DEBUG_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c -g -O0  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang\r
-RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    -Os  -Wall -Werror -include AutoGen.h -fno-stack-protector -fno-builtin -fshort-wchar -mdynamic-no-pic -Wno-empty-body -Wno-pointer-sign -Wno-unused-function -Wno-unused-value -Wno-missing-braces -Wno-tautological-compare -Wreturn-type -Wno-unused-variable -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang\r
-*_XCLANG_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h -mdynamic-no-pic\r
-*_XCLANG_*_ASLDLINK_FLAGS   = -e _main -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-*_XCLANG_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h\r
-*_XCLANG_*_ASL_FLAGS        =\r
-\r
 #\r
 # XCODE5 support\r
 #\r