BaseTools: Clean up tools_def.template for XCODE5

Reorganize the statements for XCODE5 to match other tool
chains and remove dependency on XCLANG and XCODE32

Cc: Andrew Fish <afish@apple.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Andrew Fish <afish@apple.com>

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index ed9e834078894b19eeb5c66da8b47bb09aa43874..4b1b7b548cc9cd9357e5e4b08b227782755fde33 100755 (executable)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -7435,29 +7435,40 @@ RELEASE_XCLANG_X64_CC_FLAGS   = -ccc-host-triple x86_64-pc-win32-macho -c    -Os
 *_XCODE5_*_*_BUILDRULEFAMILY   = XCODE\r
 *_XCODE5_*_*_BUILDRULEORDER    = S s nasm\r
 \r
-*_XCODE5_*_ASL_PATH          = /usr/bin/iasl\r
+#\r
+# use xcode-select to change Xcode version of command line tools\r
+#\r
+*_XCODE5_*_MAKE_PATH     = make\r
+*_XCODE5_*_CC_PATH       = clang\r
+*_XCODE5_*_SLINK_PATH    = libtool\r
+*_XCODE5_*_DLINK_PATH    = ld\r
+*_XCODE5_*_ASM_PATH      = as\r
+*_XCODE5_*_PP_PATH       = clang\r
+*_XCODE5_*_VFRPP_PATH    = clang\r
+*_XCODE5_*_ASL_PATH      = iasl\r
+*_XCODE5_*_ASLCC_PATH    = clang\r
+*_XCODE5_*_ASLPP_PATH    = clang\r
+*_XCODE5_*_ASLDLINK_PATH = ld\r
+*_XCODE5_*_DSYMUTIL_PATH = /usr/bin/dsymutil\r
+*_XCODE5_*_MTOC_PATH     = /usr/local/bin/mtoc\r
 \r
-*_XCODE5_*_MAKE_PATH        = make\r
-*_XCODE5_*_DSYMUTIL_PATH    = /usr/bin/dsymutil\r
+##################\r
+# ASL definitions\r
+##################\r
+*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h\r
+*_XCODE5_*_ASLDLINK_FLAGS   = -e _ReferenceAcpiTable -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
+*_XCODE5_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h\r
+*_XCODE5_*_ASL_FLAGS        =\r
+*_XCODE5_*_ASL_OUTFLAGS     = DEF(IASL_OUTFLAGS)\r
+\r
+##################\r
+# MTOC definitions\r
+##################\r
 \r
   DEBUG_XCODE5_*_MTOC_FLAGS = -align 0x20 -d $(DEBUG_DIR)/$(MODULE_NAME).dll\r
   NOOPT_XCODE5_*_MTOC_FLAGS = -align 0x20 -d $(DEBUG_DIR)/$(MODULE_NAME).dll\r
 RELEASE_XCODE5_*_MTOC_FLAGS = -align 0x20 \r
 \r
-#\r
-# use xcode-select to change Xcode version of command line tools\r
-#\r
-*_XCODE5_*_CC_PATH      = clang\r
-*_XCODE5_*_SLINK_PATH   = libtool\r
-*_XCODE5_*_DLINK_PATH   = ld\r
-*_XCODE5_*_ASM_PATH     = as\r
-*_XCODE5_*_PP_PATH      = clang\r
-*_XCODE5_*_VFRPP_PATH   = clang\r
-*_XCODE5_*_ASL_PATH     = iasl\r
-*_XCODE5_*_ASLCC_PATH   = clang\r
-*_XCODE5_*_ASLPP_PATH   = clang\r
-*_XCODE5_*_ASLDLINK_PATH  = ld\r
-\r
 ####################\r
 # IA-32 definitions\r
 ####################\r
@@ -7476,8 +7487,6 @@ RELEASE_XCODE5_IA32_ASM_FLAGS  = -arch i386
 RELEASE_XCODE5_IA32_CC_FLAGS   = -arch i386 -c    -Os       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)\r
   NOOPT_XCODE5_IA32_CC_FLAGS   = -arch i386 -c -g -O0       -Wall -Werror -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fshort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS)\r
 \r
-\r
-\r
 ##################\r
 # X64 definitions\r
 ##################\r
@@ -7493,17 +7502,10 @@ RELEASE_XCODE5_X64_ASM_FLAGS  = -arch x86_64
 *_XCODE5_*_PP_FLAGS         = -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h \r
 *_XCODE5_*_VFRPP_FLAGS      = -x c -E -P -DVFRCOMPILE -include $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h \r
 \r
-\r
   DEBUG_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)\r
   NOOPT_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c -g -O0       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)\r
 RELEASE_XCODE5_X64_CC_FLAGS   = -target x86_64-pc-win32-macho -c    -Os       -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implicit-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-initializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS)\r
 \r
-*_XCODE5_*_ASLCC_FLAGS      = -x c -save-temps -g -O0 -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h \r
-*_XCODE5_*_ASLDLINK_FLAGS   = -e _ReferenceAcpiTable -preload -segalign 0x20  -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG)/$(BASE_NAME).map\r
-*_XCODE5_*_ASLPP_FLAGS      = -x c -E -include AutoGen.h\r
-*_XCODE5_*_ASL_FLAGS        =\r
-*_XCODE5_*_ASL_OUTFLAGS     = DEF(IASL_OUTFLAGS)\r
-\r
 ####################################################################################\r
 #\r
 # RVCT Common\r