From nobody Sun Dec 29 02:26:36 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1495176747754986.7684864597817; Thu, 18 May 2017 23:52:27 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 549AA2195FD42; Thu, 18 May 2017 23:52:21 -0700 (PDT) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A403521A16EEF for ; Thu, 18 May 2017 23:52:19 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 May 2017 23:52:19 -0700 Received: from mdkinney-mobl.amr.corp.intel.com ([10.254.56.31]) by fmsmga006.fm.intel.com with ESMTP; 18 May 2017 23:52:19 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,362,1491289200"; d="scan'208";a="104385709" From: Michael Kinney To: edk2-devel@lists.01.org Date: Thu, 18 May 2017 23:52:16 -0700 Message-Id: <1495176736-28376-3-git-send-email-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.6.3.windows.1 In-Reply-To: <1495176736-28376-1-git-send-email-michael.d.kinney@intel.com> References: <1495176736-28376-1-git-send-email-michael.d.kinney@intel.com> Subject: [edk2] [Patch 2/2] BaseTools: Clean up tools_def.template for XCODE5 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Andrew Fish , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Reorganize the statements for XCODE5 to match other tool chains and remove dependency on XCLANG and XCODE32 Cc: Andrew Fish Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael D Kinney --- BaseTools/Conf/tools_def.template | 54 ++++++++++++++++++++---------------= ---- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index ed9e834..4b1b7b5 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -7435,29 +7435,40 @@ RELEASE_XCLANG_X64_CC_FLAGS =3D -ccc-host-triple = x86_64-pc-win32-macho -c -Os *_XCODE5_*_*_BUILDRULEFAMILY =3D XCODE *_XCODE5_*_*_BUILDRULEORDER =3D S s nasm =20 -*_XCODE5_*_ASL_PATH =3D /usr/bin/iasl +# +# use xcode-select to change Xcode version of command line tools +# +*_XCODE5_*_MAKE_PATH =3D make +*_XCODE5_*_CC_PATH =3D clang +*_XCODE5_*_SLINK_PATH =3D libtool +*_XCODE5_*_DLINK_PATH =3D ld +*_XCODE5_*_ASM_PATH =3D as +*_XCODE5_*_PP_PATH =3D clang +*_XCODE5_*_VFRPP_PATH =3D clang +*_XCODE5_*_ASL_PATH =3D iasl +*_XCODE5_*_ASLCC_PATH =3D clang +*_XCODE5_*_ASLPP_PATH =3D clang +*_XCODE5_*_ASLDLINK_PATH =3D ld +*_XCODE5_*_DSYMUTIL_PATH =3D /usr/bin/dsymutil +*_XCODE5_*_MTOC_PATH =3D /usr/local/bin/mtoc =20 -*_XCODE5_*_MAKE_PATH =3D make -*_XCODE5_*_DSYMUTIL_PATH =3D /usr/bin/dsymutil +################## +# ASL definitions +################## +*_XCODE5_*_ASLCC_FLAGS =3D -x c -save-temps -g -O0 -fshort-wchar -fno= -strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h +*_XCODE5_*_ASLDLINK_FLAGS =3D -e _ReferenceAcpiTable -preload -segalign = 0x20 -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG= )/$(BASE_NAME).map +*_XCODE5_*_ASLPP_FLAGS =3D -x c -E -include AutoGen.h +*_XCODE5_*_ASL_FLAGS =3D +*_XCODE5_*_ASL_OUTFLAGS =3D DEF(IASL_OUTFLAGS) + +################## +# MTOC definitions +################## =20 DEBUG_XCODE5_*_MTOC_FLAGS =3D -align 0x20 -d $(DEBUG_DIR)/$(MODULE_NAME)= .dll NOOPT_XCODE5_*_MTOC_FLAGS =3D -align 0x20 -d $(DEBUG_DIR)/$(MODULE_NAME)= .dll RELEASE_XCODE5_*_MTOC_FLAGS =3D -align 0x20=20 =20 -# -# use xcode-select to change Xcode version of command line tools -# -*_XCODE5_*_CC_PATH =3D clang -*_XCODE5_*_SLINK_PATH =3D libtool -*_XCODE5_*_DLINK_PATH =3D ld -*_XCODE5_*_ASM_PATH =3D as -*_XCODE5_*_PP_PATH =3D clang -*_XCODE5_*_VFRPP_PATH =3D clang -*_XCODE5_*_ASL_PATH =3D iasl -*_XCODE5_*_ASLCC_PATH =3D clang -*_XCODE5_*_ASLPP_PATH =3D clang -*_XCODE5_*_ASLDLINK_PATH =3D ld - #################### # IA-32 definitions #################### @@ -7476,8 +7487,6 @@ RELEASE_XCODE5_IA32_ASM_FLAGS =3D -arch i386 RELEASE_XCODE5_IA32_CC_FLAGS =3D -arch i386 -c -Os -Wall -Werro= r -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fsh= ort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields = -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-i= nitializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=3Du= ndefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS) NOOPT_XCODE5_IA32_CC_FLAGS =3D -arch i386 -c -g -O0 -Wall -Werro= r -include AutoGen.h -funsigned-char -fno-stack-protector -fno-builtin -fsh= ort-wchar -fasm-blocks -mdynamic-no-pic -mno-implicit-float -mms-bitfields = -msoft-float -Wno-unused-parameter -Wno-missing-braces -Wno-missing-field-i= nitializers -Wno-tautological-compare -Wno-sign-compare -ftrap-function=3Du= ndefined_behavior_has_been_optimized_away_by_clang $(PLATFORM_FLAGS) =20 - - ################## # X64 definitions ################## @@ -7493,17 +7502,10 @@ RELEASE_XCODE5_X64_ASM_FLAGS =3D -arch x86_64 *_XCODE5_*_PP_FLAGS =3D -E -x assembler-with-cpp -include $(DEST_D= IR_DEBUG)/AutoGen.h=20 *_XCODE5_*_VFRPP_FLAGS =3D -x c -E -P -DVFRCOMPILE -include $(DEST_DI= R_DEBUG)/$(MODULE_NAME)StrDefs.h=20 =20 - DEBUG_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -g -Os = -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-exte= nsions -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= =3Dundefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS= $(PLATFORM_FLAGS) NOOPT_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -g -O0 = -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-exte= nsions -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= =3Dundefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS= $(PLATFORM_FLAGS) RELEASE_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -Os = -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno-ms-exte= nsions -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= =3Dundefined_behavior_has_been_optimized_away_by_clang -D NO_MSABI_VA_FUNCS= $(PLATFORM_FLAGS) =20 -*_XCODE5_*_ASLCC_FLAGS =3D -x c -save-temps -g -O0 -fshort-wchar -fno= -strict-aliasing -Wall -Werror -Wno-missing-braces -c -include AutoGen.h=20 -*_XCODE5_*_ASLDLINK_FLAGS =3D -e _ReferenceAcpiTable -preload -segalign = 0x20 -pie -seg1addr 0x240 -read_only_relocs suppress -map $(DEST_DIR_DEBUG= )/$(BASE_NAME).map -*_XCODE5_*_ASLPP_FLAGS =3D -x c -E -include AutoGen.h -*_XCODE5_*_ASL_FLAGS =3D -*_XCODE5_*_ASL_OUTFLAGS =3D DEF(IASL_OUTFLAGS) - ##########################################################################= ########## # # RVCT Common --=20 2.6.3.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel