From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49341+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49341+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755505; cv=none; d=zoho.com; s=zohoarc; b=NfJo7Z6WbOL0wwVfajqbgdJqdgPVJ/6U9nrDKGt/Qj3o5EiEGMYTgXbijW2CALjfv24z0fPfOZs18ppEPgBegH4b9C/L7pRLb3dy0iA2VvbAwiagA75V2pyyqpA44UurmdNAGHLiR4R+a/+Gn2onZgNfBFN3rW2UGKxUFEmpRTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755505; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=r+gFNTQ2rtSck3uFyhPCanmD82WGCyTRwlRoF0X98xw=; b=mvjx2/1W92Ja57IYdC4NiEcVHO4+R/nwMIJQJ+nNjUSZ5t1WQP49W7bapyWhWIpY5LctcOetw/YpnNYnbNw5fTE5DrhMLkuTwbsDVnB1tG0Q9bWOIKkYOHd5E6wXCcJqPJsoSFweRrILOxqa14Sx2O72kD5dyvTm4+iuCx+oFuU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49341+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1571755505581297.7645395380058; Tue, 22 Oct 2019 07:45:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id fTE8YY1788612x34FW4QkcAi; Tue, 22 Oct 2019 07:45:02 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web12.5508.1571755501146194187 for ; Tue, 22 Oct 2019 07:45:01 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:44:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139474" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:44:55 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 01/11] BaseTools tools_def.template: Remove unnecessary $(DEST_DIR_DEBUG) path Date: Tue, 22 Oct 2019 22:43:55 +0800 Message-Id: <20191022144406.6996-2-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: zK9svrBBwcv7IiZKzec6wzOBx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755502; bh=lWKEw9Jd5f9LAZfur24F0VY9duOQCeqTSWIDVqiFn+k=; h=Date:From:Reply-To:Subject:To; b=j/t8/eFiaZUOFQA88KvP7v05qXI3eI7JSD1kLsMOvD4Xf7EQ+DZ4RxX9drjCRaOb2pR adC/s0Tdc9Ro1gC6YDMM6J/XbEq/GgxzWOg4kfwtahXaAhCbDY7JTES8y+Elig1pqCnUA wQ5OBBFLkb0WCIPLcPdRb6k5mbHiA7FF7tc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 $(DEST_DIR_DEBUG) path is in Include directory. It is not required to be specified again. Signed-off-by: Liming Gao Reviewed-by: Bob Feng --- BaseTools/Conf/tools_def.template | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index 88a6764f43..fd6fca542d 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -350,8 +350,8 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # *_*_EBC_SLINK_PATH =3D C:\Program Files\Intel\EBC\Bin\li= nk.exe # # *_*_EBC_SLINK_FLAGS =3D /lib /NOLOGO /MACHINE:EBC -# *_*_EBC_PP_FLAGS =3D /nologo /E /TC /FI$(DEST_DIR_DEBU= G)/AutoGen.h -# *_*_EBC_CC_FLAGS =3D /nologo /FAcs /c /W3 /WX /FI$(DES= T_DIR_DEBUG)/AutoGen.h +# *_*_EBC_PP_FLAGS =3D /nologo /E /TC /FIAutoGen.h +# *_*_EBC_CC_FLAGS =3D /nologo /FAcs /c /W3 /WX /FIAutoG= en.h # *_*_EBC_DLINK_FLAGS =3D "C:\Program Files\Intel\EBC\Lib\E= bcLib.lib" /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:$(IMAGE_ENTRY= _POINT) /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER /ALIGN:32 /DRIVER # ##########################################################################= ########## @@ -1906,13 +1906,13 @@ DEFINE GCC_IA32_X64_ASLDLINK_FLAGS =3D DEF(GCC_IA32= _X64_DLINK_COMMON) --entry _Ref DEFINE GCC_ARM_ASLDLINK_FLAGS =3D DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entr= y,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_F= LAGS) DEFINE GCC_AARCH64_ASLDLINK_FLAGS =3D DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--= entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLI= NK_FLAGS) DEFINE GCC_IA32_X64_DLINK_FLAGS =3D DEF(GCC_IA32_X64_DLINK_COMMON) --en= try _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -M= ap $(DEST_DIR_DEBUG)/$(BASE_NAME).map -DEFINE GCC_ASM_FLAGS =3D -c -x assembler -imacros $(DEST_DIR= _DEBUG)/AutoGen.h -DEFINE GCC_PP_FLAGS =3D -E -x assembler-with-cpp -include $= (DEST_DIR_DEBUG)/AutoGen.h -DEFINE GCC_VFRPP_FLAGS =3D -x c -E -P -DVFRCOMPILE --include $= (DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h +DEFINE GCC_ASM_FLAGS =3D -c -x assembler -imacros AutoGen.h +DEFINE GCC_PP_FLAGS =3D -E -x assembler-with-cpp -include A= utoGen.h +DEFINE GCC_VFRPP_FLAGS =3D -x c -E -P -DVFRCOMPILE --include $= (MODULE_NAME)StrDefs.h DEFINE GCC_ASLPP_FLAGS =3D -x c -E -include AutoGen.h DEFINE GCC_ASLCC_FLAGS =3D -x c DEFINE GCC_WINDRES_FLAGS =3D -J rc -O coff -DEFINE GCC_DTCPP_FLAGS =3D -E -x assembler-with-cpp -imacros $= (DEST_DIR_DEBUG)/AutoGen.h -nostdinc -undef +DEFINE GCC_DTCPP_FLAGS =3D -E -x assembler-with-cpp -imacros A= utoGen.h -nostdinc -undef DEFINE GCC_IA32_RC_FLAGS =3D -I binary -O elf32-i386 -B= i386 --rename-section .data=3D.hii DEFINE GCC_X64_RC_FLAGS =3D -I binary -O elf64-x86-64 -B= i386 --rename-section .data=3D.hii DEFINE GCC_ARM_RC_FLAGS =3D -I binary -O elf32-littlearm -B= arm --rename-section .data=3D.hii @@ -2772,8 +2772,8 @@ RELEASE_XCODE5_X64_DLINK_FLAGS =3D -arch x86_64 = -u _$(IMAGE_ENTRY_POINT) -e _ NOOPT_XCODE5_X64_ASM_FLAGS =3D -arch x86_64 -g RELEASE_XCODE5_X64_ASM_FLAGS =3D -arch x86_64 *_XCODE5_X64_NASM_FLAGS =3D -f macho64 -*_XCODE5_*_PP_FLAGS =3D -E -x assembler-with-cpp -include $(DEST_D= IR_DEBUG)/AutoGen.h -*_XCODE5_*_VFRPP_FLAGS =3D -x c -E -P -DVFRCOMPILE -include $(DEST_DI= R_DEBUG)/$(MODULE_NAME)StrDefs.h +*_XCODE5_*_PP_FLAGS =3D -E -x assembler-with-cpp -include AutoGen.h +*_XCODE5_*_VFRPP_FLAGS =3D -x c -E -P -DVFRCOMPILE -include $(MODULE_= NAME)StrDefs.h =20 DEBUG_XCODE5_X64_CC_FLAGS =3D -target x86_64-pc-win32-macho -c -g -gdw= arf -Os -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno= -ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implici= t-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missi= ng-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-vara= rgs -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 -gdw= arf -O0 -Wall -Werror -Wextra -include AutoGen.h -funsigned-char -fno= -ms-extensions -fno-stack-protector -fno-builtin -fshort-wchar -mno-implici= t-float -mms-bitfields -Wno-unused-parameter -Wno-missing-braces -Wno-missi= ng-field-initializers -Wno-tautological-compare -Wno-sign-compare -Wno-vara= rgs -ftrap-function=3Dundefined_behavior_has_been_optimized_away_by_clang -= D NO_MSABI_VA_FUNCS $(PLATFORM_FLAGS) @@ -2812,7 +2812,7 @@ RELEASE_RVCT_ARM_DLINK_FLAGS =3D $(ARCHDLINK_FLAG= S) DEF(RVCT_ALL_DLINK_FLAGS) =20 *_RVCT_ARM_ASM_FLAGS =3D $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT= _ALL_ASM_FLAGS) *_RVCT_ARM_PP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E --prei= nclude AutoGen.h -*_RVCT_ARM_VFRPP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFR= COMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h +*_RVCT_ARM_VFRPP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -DVFR= COMPILE --preinclude $(MODULE_NAME)StrDefs.h *_RVCT_ARM_MAKE_PATH =3D nmake /NOLOGO *_RVCT_ARM_SLINK_FLAGS =3D --partial -o DEBUG_RVCT_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(RVCT_= ALL_CC_FLAGS) -O1 -g @@ -2853,7 +2853,7 @@ RELEASE_RVCTLINUX_ARM_DLINK_FLAGS =3D $(ARCHDLINK_F= LAGS) DEF(RVCT_ALL_DLINK_FLAG =20 *_RVCTLINUX_ARM_ASM_FLAGS =3D $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF= (RVCT_ALL_ASM_FLAGS) *_RVCTLINUX_ARM_PP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E -*_RVCTLINUX_ARM_VFRPP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E = -DVFRCOMPILE --preinclude $(DEST_DIR_DEBUG)/$(MODULE_NAME)StrDefs.h +*_RVCTLINUX_ARM_VFRPP_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -E = -DVFRCOMPILE --preinclude $(MODULE_NAME)StrDefs.h *_RVCTLINUX_ARM_SLINK_FLAGS =3D --partial -o DEBUG_RVCTLINUX_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) DEF(= RVCT_ALL_CC_FLAGS) -O1 -g RELEASE_RVCTLINUX_ARM_CC_FLAGS =3D $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) --di= ag_suppress=3D550 DEF(RVCT_ALL_CC_FLAGS) -O2 @@ -2900,7 +2900,7 @@ RELEASE_RVCTCYGWIN_ARM_DLINK_FLAGS =3D "$(DLINKPA= TH_FLAG)" $(ARCHDLINK_FLAGS) =20 *_RVCTCYGWIN_ARM_ASM_FLAGS =3D "$(ASMPATH_FLAG)" $(ARCHASM_FLAGS) $(= PLATFORM_FLAGS) DEF(RVCT_ALL_ASM_FLAGS) *_RVCTCYGWIN_ARM_PP_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) -E -*_RVCTCYGWIN_ARM_VFRPP_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(DEST_DIR_DEBUG)/$= (MODULE_NAME)StrDefs.h` +*_RVCTCYGWIN_ARM_VFRPP_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) -E -DVFRCOMPILE --preinclude `cygpath -m $(MODULE_NAME)StrDe= fs.h` *_RVCTCYGWIN_ARM_MAKE_PATH =3D make *_RVCTCYGWIN_ARM_SLINK_FLAGS =3D "$(SLINKPATH_FLAG)" --partial -o DEBUG_RVCTCYGWIN_ARM_CC_FLAGS =3D "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PL= ATFORM_FLAGS) DEF(RVCT_ALL_CC_FLAGS) -O1 -g --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49341): https://edk2.groups.io/g/devel/message/49341 Mute This Topic: https://groups.io/mt/36443972/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49342+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49342+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755504; cv=none; d=zoho.com; s=zohoarc; b=C/NOPh77mO+tUTE1jkegUsCrTyK8GXpwxx+X6kMHj1BwKXnYBa9s+QEYSZCd3qwSiGRg/BKWCQSfQ2m+119rlQBVlgQCeKJ0Cvw4XcAw7LxiCuc7/4/ddnYVqWE5H2iXrF1e3fxEpsPDsLFBhwSy4fKkNf1Lga2avj8DD8ctO2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755504; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=OcbexUlDB77Rpy6joU7aMdFZXqsw+KZdY4jLN7hbgUo=; b=Lpt62jXf1Da1MfBAsnARok712TAI9fxDZxhwY52N9cJmuWtLPwS/4oGONtsl3omgGM3ORMvsRY8h7sx4MJmCUb3EA4hoYI96p5ns/zNqG2kOCkfZzImMvsQX4XDfBg2AoZIEfJQzxAMRnGo4UBh3TU8x9s8RPRGV7WVhGSHB+rY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49342+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1571755504777657.810326315572; Tue, 22 Oct 2019 07:45:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id AKFgYY1788612xOUJPNcHoWd; Tue, 22 Oct 2019 07:45:03 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web12.5508.1571755501146194187 for ; Tue, 22 Oct 2019 07:45:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:44:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139478" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:44:56 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Bob Feng Subject: [edk2-devel] [Patch 02/11] BaseTools tools_def: Add CLANG9 tool chain to directly generate PE image Date: Tue, 22 Oct 2019 22:43:56 +0800 Message-Id: <20191022144406.6996-3-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: lPODZgSdPyx9lVhgiIg36SH5x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755503; bh=qUgxBaLxqiZPKnxLl6KVIQlKZfzIFUIlABUmNa9rkDQ=; h=Cc:Date:From:Reply-To:Subject:To; b=LZ7OYysIT/Syvs9UCFWPFB4V16+yrCgNHfD//FAYRA/5n0EoHTbhxdAMSRj2PbJSKTg SNNXX115G62pSZM44tQFztnuUWnBI49HD9yrFnu5PbTDckHDtQnbrkjgq5hnhGwxkdgd6 6AjhZ0Hu6esSn0B8Id++vxdfQuYs++jIB5w= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 Signed-off-by: Liming Gao Cc: Bob Feng --- BaseTools/Conf/build_rule.template | 26 ++++++---- BaseTools/Conf/tools_def.template | 102 +++++++++++++++++++++++++++++++++= ++++ 2 files changed, 118 insertions(+), 10 deletions(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule= .template index db06d3a6b4..3a58ac8015 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -260,7 +260,7 @@ $(OUTPUT_DIR)(+)$(MODULE_NAME).lib =20 - + "$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} @$(OBJECT_FILES_LIST) =20 @@ -291,6 +291,9 @@ "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_SPAT= H) @$(STATIC_LIBRARY_FILES_LIST) "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIB= RARY_FILES_LIST) =20 + + "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIB= RARY_FILES_LIST) $(DLINK2_FLAGS) + "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -Wl,--start-group,@$(STATIC_LI= BRARY_FILES_LIST),--end-group $(CC_FLAGS) $(DLINK2_FLAGS) "$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst} @@ -331,7 +334,7 @@ $(DEBUG_DIR)(+)$(MODULE_NAME) =20 - + "$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_L= IST) =20 @@ -355,7 +358,7 @@ $(OUTPUT_DIR)(+)$(MODULE_NAME).efi =20 - + "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS) $(CP) ${dst} $(DEBUG_DIR) $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi @@ -460,9 +463,14 @@ =20 "$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLA= GS) $(ASLCC_FLAGS) $(INC) ${src} - "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLI= NK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj + "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLI= NK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAG= S) "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $= (GENFW_FLAGS) - =20 + + + "$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLA= GS) $(ASLCC_FLAGS) $(INC) ${src} + "$(ASLDLINK)" /OUT:$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLD= LINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj + "$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $= (GENFW_FLAGS) + =20 "$(ASLCC)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASLCC_FL= AGS) $(INC) ${src} "$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLI= NK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj @@ -622,21 +630,19 @@ *.hpk =20 - + $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.lib =20 $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc =20 - + "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiipackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) "$(RC)" /Fo${dst} $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc =20 "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS) "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst} - =20 + GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --= hiibinpackage $(HII_BINARY_PACKAGES) - =20 - =20 diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index fd6fca542d..dce6c5875a 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -268,6 +268,15 @@ DEFINE DTC_BIN =3D ENV(DTC_PREFIX)dtc # Required to build platforms or ACPI tables: # Intel(r) ACPI Compiler from # https://acpica.org/downloads +# CLANG9 -Linux, Windows, Mac- Requires: +# Clang 9 or above from http://releases.llvm.o= rg/ +# Optional: +# Required to compile nasm source: +# nasm compiler from +# NASM -- http://www.nasm.us/ +# Required to build platforms or ACPI tables: +# Intel(r) ACPI Compiler from +# https://acpica.org/downloads # VS2008x86 -win64- Requires: # Microsoft Visual Studio 2008 (x86) # Microsoft Windows Server 2003 Driver Develop= ment Kit (Microsoft WINDDK) version 3790.1830 @@ -2698,6 +2707,99 @@ DEFINE CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_= AARCH64_TARGET) DEF(GCC_AARCH6 RELEASE_CLANG38_AARCH64_CC_FLAGS =3D DEF(CLANG38_AARCH64_CC_FLAGS) $(AR= CHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O3 RELEASE_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O3 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin= -opt=3D-pass-through=3D-llto-aarch64 =20 +##########################################################################= ########## +# +# CLANG9 - This configuration is used to compile under Windows/Linux/Mac t= o produce +# PE/COFF binaries using LLVM/Clang/LLD with Link Time Optimization enabl= ed +# +##########################################################################= ########## +*_CLANG9_*_*_FAMILY =3D GCC +*_CLANG9_*_*_BUILDRULEFAMILY =3D CLANGPE +*_CLANG9_*_MAKE_PATH =3D ENV(CLANG_HOST_BIN)make +*_CLANG9_*_*_DLL =3D ENV(CLANG9_DLL) +*_CLANG9_*_ASL_PATH =3D DEF(UNIX_IASL_BIN) + +*_CLANG9_*_APP_FLAGS =3D +*_CLANG9_*_ASL_FLAGS =3D DEF(DEFAULT_WIN_ASL_FLAGS) +*_CLANG9_*_ASL_OUTFLAGS =3D DEF(DEFAULT_WIN_ASL_OUTFLAGS) +*_CLANG9_*_ASLDLINK_FLAGS =3D DEF(MSFT_ASLDLINK_FLAGS) + +DEFINE CLANG9_IA32_PREFIX =3D ENV(CLANG9_BIN) +DEFINE CLANG9_X64_PREFIX =3D ENV(CLANG9_BIN) + +DEFINE CLANG9_IA32_TARGET =3D -target i686-unknown-windows +DEFINE CLANG9_X64_TARGET =3D -target x86_64-unknown-windows + +DEFINE CLANG9_WARNING_OVERRIDES =3D -Wno-parentheses-equality -Wno-taut= ological-compare -Wno-tautological-constant-out-of-range-compare -Wno-empty= -body -Wno-unused-const-variable -Wno-varargs -Wno-unknown-warning-option -= Wno-microsoft-enum-forward-reference +DEFINE CLANG9_ALL_CC_FLAGS =3D DEF(GCC48_ALL_CC_FLAGS) DEF(CLANG9_= WARNING_OVERRIDES) -fno-stack-protector -mms-bitfields -Wno-address -Wno-sh= ift-negative-value -Wno-unknown-pragmas -Wno-incompatible-library-redeclara= tion -fno-asynchronous-unwind-tables -mno-implicit-float -ftrap-function= =3Dundefined_behavior_has_been_optimized_away_by_clang -funsigned-char -fno= -ms-extensions -Wno-null-dereference -fms-compatibility -mno-stack-arg-probe + +########################### +# CLANG9 IA32 definitions +########################### +*_CLANG9_IA32_CC_PATH =3D DEF(CLANG9_IA32_PREFIX)clang +*_CLANG9_IA32_SLINK_PATH =3D DEF(CLANG9_IA32_PREFIX)llvm-lib +*_CLANG9_IA32_DLINK_PATH =3D DEF(CLANG9_IA32_PREFIX)lld-link +*_CLANG9_IA32_ASLDLINK_PATH =3D DEF(CLANG9_IA32_PREFIX)lld-link +*_CLANG9_IA32_ASM_PATH =3D DEF(CLANG9_IA32_PREFIX)clang +*_CLANG9_IA32_PP_PATH =3D DEF(CLANG9_IA32_PREFIX)clang +*_CLANG9_IA32_VFRPP_PATH =3D DEF(CLANG9_IA32_PREFIX)clang +*_CLANG9_IA32_ASLCC_PATH =3D DEF(CLANG9_IA32_PREFIX)clang +*_CLANG9_IA32_ASLPP_PATH =3D DEF(CLANG9_IA32_PREFIX)clang +*_CLANG9_IA32_RC_PATH =3D DEF(CLANG9_IA32_PREFIX)llvm-rc + +*_CLANG9_IA32_ASLCC_FLAGS =3D DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto = DEF(CLANG9_IA32_TARGET) +*_CLANG9_IA32_ASM_FLAGS =3D DEF(GCC_ASM_FLAGS) -m32 -march=3Di3= 86 DEF(CLANG9_IA32_TARGET) +*_CLANG9_IA32_OBJCOPY_FLAGS =3D +*_CLANG9_IA32_NASM_FLAGS =3D -f win32 +*_CLANG9_IA32_PP_FLAGS =3D DEF(GCC_PP_FLAGS) DEF(CLANG9_IA32_T= ARGET) +*_CLANG9_IA32_ASLPP_FLAGS =3D DEF(GCC_ASLPP_FLAGS) DEF(CLANG9_IA3= 2_TARGET) +*_CLANG9_IA32_VFRPP_FLAGS =3D DEF(GCC_VFRPP_FLAGS) DEF(CLANG9_IA3= 2_TARGET) + +DEBUG_CLANG9_IA32_CC_FLAGS =3D DEF(CLANG9_ALL_CC_FLAGS) -m32 -Oz -= flto -march=3Di586 DEF(CLANG9_IA32_TARGET) -gcodeview +DEBUG_CLANG9_IA32_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 = /OPT:REF /OPT:ICF=3D10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.= pdata,D /MACHINE:X86 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_S= ERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH /lldmap +DEBUG_CLANG9_IA32_DLINK2_FLAGS =3D + +RELEASE_CLANG9_IA32_CC_FLAGS =3D DEF(CLANG9_ALL_CC_FLAGS) -m32 -Oz -= flto -march=3Di586 DEF(CLANG9_IA32_TARGET) +RELEASE_CLANG9_IA32_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 = /IGNORE:4254 /OPT:REF /OPT:ICF=3D10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata= ,D /SECTION:.pdata,D /MACHINE:X86 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYST= EM:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /MERGE:.rdata=3D.data /lldm= ap +RELEASE_CLANG9_IA32_DLINK2_FLAGS =3D + +NOOPT_CLANG9_IA32_CC_FLAGS =3D DEF(CLANG9_ALL_CC_FLAGS) -m32 -O0 -= march=3Di586 DEF(CLANG9_IA32_TARGET) -gcodeview +NOOPT_CLANG9_IA32_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 = /OPT:REF /OPT:ICF=3D10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.= pdata,D /MACHINE:X86 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_S= ERVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH /lldmap +NOOPT_CLANG9_IA32_DLINK2_FLAGS =3D + +########################## +# CLANGWIN X64 definitions +########################## +*_CLANG9_X64_CC_PATH =3D DEF(CLANG9_X64_PREFIX)clang +*_CLANG9_X64_SLINK_PATH =3D DEF(CLANG9_X64_PREFIX)llvm-lib +*_CLANG9_X64_DLINK_PATH =3D DEF(CLANG9_X64_PREFIX)lld-link +*_CLANG9_X64_ASLDLINK_PATH =3D DEF(CLANG9_X64_PREFIX)lld-link +*_CLANG9_X64_ASM_PATH =3D DEF(CLANG9_X64_PREFIX)clang +*_CLANG9_X64_PP_PATH =3D DEF(CLANG9_X64_PREFIX)clang +*_CLANG9_X64_VFRPP_PATH =3D DEF(CLANG9_X64_PREFIX)clang +*_CLANG9_X64_ASLCC_PATH =3D DEF(CLANG9_X64_PREFIX)clang +*_CLANG9_X64_ASLPP_PATH =3D DEF(CLANG9_X64_PREFIX)clang +*_CLANG9_X64_RC_PATH =3D DEF(CLANG9_IA32_PREFIX)llvm-rc + +*_CLANG9_X64_ASLCC_FLAGS =3D DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto D= EF(CLANG9_X64_TARGET) +*_CLANG9_X64_ASM_FLAGS =3D DEF(GCC_ASM_FLAGS) -m64 DEF(CLANG9_X= 64_TARGET) +*_CLANG9_X64_OBJCOPY_FLAGS =3D +*_CLANG9_X64_NASM_FLAGS =3D -f win64 +*_CLANG9_X64_PP_FLAGS =3D DEF(GCC_PP_FLAGS) DEF(CLANG9_X64_TAR= GET) +*_CLANG9_X64_ASLPP_FLAGS =3D DEF(GCC_ASLPP_FLAGS) DEF(CLANG9_X64_= TARGET) +*_CLANG9_X64_VFRPP_FLAGS =3D DEF(GCC_VFRPP_FLAGS) DEF(CLANG9_X64_= TARGET) + +DEBUG_CLANG9_X64_CC_FLAGS =3D DEF(CLANG9_ALL_CC_FLAGS) -m64 "-DEFI= API=3D__attribute__((ms_abi))" -mno-red-zone -mcmodel=3Dsmall -Oz -flto DEF= (CLANG9_X64_TARGET) -gcodeview +DEBUG_CLANG9_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /= OPT:REF /OPT:ICF=3D10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.p= data,D /Machine:X64 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SE= RVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH /lldmap +DEBUG_CLANG9_X64_DLINK2_FLAGS =3D + +RELEASE_CLANG9_X64_CC_FLAGS =3D DEF(CLANG9_ALL_CC_FLAGS) -m64 "-DEFI= API=3D__attribute__((ms_abi))" -mno-red-zone -mcmodel=3Dsmall -Oz -flto DEF= (CLANG9_X64_TARGET) +RELEASE_CLANG9_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /= IGNORE:4254 /OPT:REF /OPT:ICF=3D10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,= D /SECTION:.pdata,D /Machine:X64 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTE= M:EFI_BOOT_SERVICE_DRIVER /SAFESEH:NO /BASE:0 /MERGE:.rdata=3D.data /lldmap +RELEASE_CLANG9_X64_DLINK2_FLAGS =3D + +NOOPT_CLANG9_X64_CC_FLAGS =3D DEF(CLANG9_ALL_CC_FLAGS) -m64 "-DEFI= API=3D__attribute__((ms_abi))" -mno-red-zone -mcmodel=3Dsmall -O0 DEF(CLANG= 9_X64_TARGET) -gcodeview +NOOPT_CLANG9_X64_DLINK_FLAGS =3D /NOLOGO /NODEFAULTLIB /IGNORE:4001 /= OPT:REF /OPT:ICF=3D10 /ALIGN:32 /FILEALIGN:32 /SECTION:.xdata,D /SECTION:.p= data,D /Machine:X64 /DLL /ENTRY:$(IMAGE_ENTRY_POINT) /SUBSYSTEM:EFI_BOOT_SE= RVICE_DRIVER /SAFESEH:NO /BASE:0 /DEBUG:GHASH /lldmap +NOOPT_CLANG9_X64_DLINK2_FLAGS =3D =20 =20 # --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49342): https://edk2.groups.io/g/devel/message/49342 Mute This Topic: https://groups.io/mt/36443973/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49343+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49343+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755505; cv=none; d=zoho.com; s=zohoarc; b=Lyw2/g1GwDqH0mhWl1rZ8AxCjlcrOG7km0RH970jdEuntlRKNvuGSyc9erx8XI0xpthmKEPiXw3XlIBCjX+n85VgtSw5E84fKF4thGXjtKIzamA1doNTV2EonyVkBy5xCBHKNEqYMSPqFfdDGOVtHr1oniIbfELIloLWM7Lxh20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755505; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=BQhWDMSH+Dxc89fs7trCv9SaMvTfbeL4BuLqhNI58q4=; b=QiOR5NEuL7ucUiZ7GAS31Ko6F1S/y42s3k/Z9++BLjUi5YCVSEldevuggjrGJw60WbFQ9z0Tl9N8YcB0k/ebsSp9+JeMaklMTaAiIDzLd/tjtf8258LO991s6wc14i7Qe7664i4bFPHIbt0aaS0C29Ea9e6pyI7WEyWCaO7QkXo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49343+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1571755505525883.2917123802555; Tue, 22 Oct 2019 07:45:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id chsAYY1788612xpV2mFM5Pki; Tue, 22 Oct 2019 07:45:03 -0700 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.5510.1571755502136308385 for ; Tue, 22 Oct 2019 07:45:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:44:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139483" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:44:57 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Bob Feng Subject: [edk2-devel] [Patch 03/11] BaseTools GenFw: Fix the issue to update the wrong size as SectionSize Date: Tue, 22 Oct 2019 22:43:57 +0800 Message-Id: <20191022144406.6996-4-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: nK7xd3rAoMp5hD89jH5D2IQ6x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755503; bh=W5QH3BlqamBeyKBMDSo1bANOHJZG56ve2EcILzlm0E8=; h=Cc:Date:From:Reply-To:Subject:To; b=dr6uSvCxXdpLuuDJ74kkmBmBVh9/V0QsAMBL0beU2EI7PvJgA3tqjqLbxMKpFGUsFka MKtOhTvaCTCgPT/NCIWw+BFUwJAGbY8glDce00oja+v3+lImAe24vJiHfoxvwnN1+aUmc bZszy9r5DsdzGd+FT+X0tOdF3hQPfHI+np0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 CLANG9 generated PE image exposes below two issues. 1. SectionSize is used to copy PE section data. It should be smaller than section raw size. 2. The real data is required to be copied. So, copy the min size of VirtualSize and SizeOfRawData. Signed-off-by: Liming Gao Cc: Bob Feng Reviewed-by: Philippe Mathieu-Daude --- BaseTools/Source/C/GenFw/GenFw.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/C/GenFw/GenFw.c b/BaseTools/Source/C/GenFw/Ge= nFw.c index c99782b78e..8cab70ba4d 100644 --- a/BaseTools/Source/C/GenFw/GenFw.c +++ b/BaseTools/Source/C/GenFw/GenFw.c @@ -653,7 +653,11 @@ PeCoffConvertImageToXip ( // // Make the size of raw data in section header alignment. // - SectionHeader->SizeOfRawData =3D (SectionHeader->Misc.VirtualSize + Pe= Hdr->Pe32.OptionalHeader.FileAlignment - 1) & (~(PeHdr->Pe32.OptionalHeader= .FileAlignment - 1)); + SectionSize =3D (SectionHeader->Misc.VirtualSize + PeHdr->Pe32.Optiona= lHeader.FileAlignment - 1) & (~(PeHdr->Pe32.OptionalHeader.FileAlignment - = 1)); + if (SectionSize < SectionHeader->SizeOfRawData) { + SectionHeader->SizeOfRawData =3D SectionSize; + } + SectionHeader->PointerToRawData =3D SectionHeader->VirtualAddress; } =20 @@ -999,7 +1003,7 @@ Returns: CopyMem ( FileBuffer + SectionHeader->PointerToRawData, (VOID*) (UINTN) (ImageContext.ImageAddress + SectionHeader->VirtualA= ddress), - SectionHeader->SizeOfRawData + SectionHeader->SizeOfRawData < SectionHeader->Misc.VirtualSize ? Sec= tionHeader->SizeOfRawData : SectionHeader->Misc.VirtualSize ); } =20 --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49343): https://edk2.groups.io/g/devel/message/49343 Mute This Topic: https://groups.io/mt/36443974/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49344+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49344+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755505; cv=none; d=zoho.com; s=zohoarc; b=HaRD/xBSs4p6GbGcenl/+4jP+KExGVKYCxNt0QSzEJL0GCQlb4rCbtpU5/mJaA7Q+Yp8fBB5lm/cGWl06rwQS7dzKO6njt64p0cfISZp/2BJa7AslVfQLPvS0hp3DKZSCmZ+F7UpWRmUVqRvZZH4slnuc+oEOK+6mQM+6ptWHwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755505; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=XH9v+9g/X2z+E3NJICpUzmu9wfSoLLM8xGGExxzqS1o=; b=U23MSLytVhPNI5SQ0/p+v0SVtDpBC6/O5rRkdc4xqyHJFAJSwy+imPoItQPxVkvE4FVdAHvt99A/8+R9yLMSufdCaBUQN1v+D+SCAzNhRHlgj0cLheMhcAKsleNCfAMaaE7A5koVEpRhl9En3eP46YUWFAL+qYYMaxxLoePQzHA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49344+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1571755505160802.0107994316947; Tue, 22 Oct 2019 07:45:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id yymTYY1788612xkeFIWyGf8B; Tue, 22 Oct 2019 07:45:03 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web12.5508.1571755501146194187 for ; Tue, 22 Oct 2019 07:45:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:44:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139487" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:44:58 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Michael Kinney Subject: [edk2-devel] [Patch 04/11] MdePkg Base.h: Add definition for CLANG9 tool chain Date: Tue, 22 Oct 2019 22:43:58 +0800 Message-Id: <20191022144406.6996-5-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: Teej50VPNtXNZY1fPT7hmEVPx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755503; bh=nBczDmUNCyCu5jw+8rq6v8pblUemWKzc2KL0GmEsHj0=; h=Cc:Date:From:Reply-To:Subject:To; b=K3eTU/l8LLGH3r2/2fm54MXT1flaOvfqnSbSdAZIx6WA0iwTn9DvUGx1PjzBVvQPJ1c 4VGShIWXfpJJyI9PUZkX7XI7oTA+eHIQWAVUj0wHT2iLMSxq2Ve67Tl4RUmdXpeRy1jZF FVf2HCcqx+v6d3fn2M1vIVAtH/rRJ1WOABI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 CLANG9 tool chain defines __clang__ macro only, doesn't define __GNUC__ macro. But, it uses some same definitions with GCC. So, update base definition for CLANG9 tool chain. Signed-off-by: Liming Gao Cc: Michael Kinney Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Michael D Kinney --- MdePkg/Include/Base.h | 6 +++--- MdePkg/Include/Ia32/ProcessorBind.h | 4 ++-- MdePkg/Include/X64/ProcessorBind.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index d94b8a5f93..4680e64136 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -621,9 +621,9 @@ typedef char* VA_LIST; #define VA_END(Marker) (Marker =3D (VA_LIST) 0) #define VA_COPY(Dest, Start) ((void)((Dest) =3D (Start))) =20 -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) =20 -#if defined(MDE_CPU_X64) && !defined(NO_MSABI_VA_FUNCS) +#if defined(MDE_CPU_X64) && !defined(NO_MSABI_VA_FUNCS) && !defined(__clan= g__) // // X64 only. Use MS ABI version of GCC built-in macros for variable argume= nt lists. // @@ -1274,7 +1274,7 @@ typedef UINTN RETURN_STATUS; =20 **/ #define RETURN_ADDRESS(L) ((L =3D=3D 0) ? _ReturnAddress() : (VOID *= ) 0) -#elif defined(__GNUC__) +#elif defined (__GNUC__) || defined (__clang__) void * __builtin_return_address (unsigned int level); /** Get the return address of the calling function. diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/Proc= essorBind.h index 497c58b33b..fa4b7e8e98 100644 --- a/MdePkg/Include/Ia32/ProcessorBind.h +++ b/MdePkg/Include/Ia32/ProcessorBind.h @@ -281,7 +281,7 @@ typedef INT32 INTN; /// Microsoft* compiler specific method for EFIAPI calling convention. /// #define EFIAPI __cdecl -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) /// /// GCC specific method for EFIAPI calling convention. /// @@ -294,7 +294,7 @@ typedef INT32 INTN; #define EFIAPI #endif =20 -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) /// /// For GNU assembly code, .global or .globl can declare global symbols. /// Define this macro to unify the usage. diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/Proces= sorBind.h index 6f65acd609..387e9c5c9c 100644 --- a/MdePkg/Include/X64/ProcessorBind.h +++ b/MdePkg/Include/X64/ProcessorBind.h @@ -313,7 +313,7 @@ typedef INT64 INTN; #define EFIAPI #endif =20 -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) /// /// For GNU assembly code, .global or .globl can declare global symbols. /// Define this macro to unify the usage. --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49344): https://edk2.groups.io/g/devel/message/49344 Mute This Topic: https://groups.io/mt/36443975/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49345+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49345+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755506; cv=none; d=zoho.com; s=zohoarc; b=ZqJJEwT3d32+OBG0/fBYROTmn4sh399x5aAcaNoWlwtv+Q/3YZcvijOXLMTnDUdGHx8tgJ+kOIu6O2fHZpgTkm12qjkrebZ/UU7FZrR5IDh92J/7YVRBOXKm/wCfAXpoQNUNWoxCykXO0sE0hc1F5PtWoUPRvCEmlI7w4d9ELqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755506; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=FHfaAzTgvYHJvXm2Vp8d6U69Q2PvGlDOtiwBu9+yHV8=; b=Iny24TfJMOKru8gNdT2fPSiLVE0YROGaajS1Wr7bx8w/xDB91OaMXnzqP3xyKBX8WaP8y3tNgulLfAkbLnD7ZHUYRL1zN9o6cOuZh13GaA55zxLM4cfCOsZ4h/PAt9ZDVaUGWwn0rhOQoNRM67fpT0YY0JNjVyp3iiMZxovcWEY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49345+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 157175550602426.853264237409576; Tue, 22 Oct 2019 07:45:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id C9XzYY1788612xvuT9YEzZnA; Tue, 22 Oct 2019 07:45:05 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web12.5510.1571755502136308385 for ; Tue, 22 Oct 2019 07:45:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:44:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139496" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:44:58 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Michael Kinney Subject: [edk2-devel] [Patch 05/11] MdePkg BaseIoLibIntrinsic: Remove __inline__ attribute for IO functions Date: Tue, 22 Oct 2019 22:43:59 +0800 Message-Id: <20191022144406.6996-6-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: EElXcUe5wHbx0l43SlcO7Wuxx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755505; bh=4vIqDYs/z6ftfTEvMFvYfDa5wqzqbod24xB1VfQODUY=; h=Cc:Date:From:Reply-To:Subject:To; b=PzBgAWyQkC29moa/XVF1bfpmH6yamql+0oFpgUazCw7MolXP7uMWEfJnKQ83vnrbowN dnVbI6iQ585g+kNeDQN4Wqmp2eMEYMGFKCC/AW5bhOF3HcHHZEK485tjFspkBe8BbM0Sf SvJfyOu0wYJUaNy1JfwCJr2W5Q3OrRo5+74= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 __inline__ has no functional difference effect with the GCC48 / GCC49 / GCC5 toolchains, but it breaks the build with CLANG9. Remove __inline__. Signed-off-by: Liming Gao Acked-by: Laszlo Ersek Cc: Michael Kinney Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Michael D Kinney --- MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c b/MdePkg/Library/= BaseIoLibIntrinsic/IoLibGcc.c index 055f0a947e..b3a1a20256 100644 --- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c +++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibGcc.c @@ -32,7 +32,6 @@ @return The value read. =20 **/ -__inline__ UINT8 EFIAPI IoRead8 ( @@ -60,7 +59,6 @@ IoRead8 ( @return The value written the I/O port. =20 **/ -__inline__ UINT8 EFIAPI IoWrite8 ( @@ -87,7 +85,6 @@ IoWrite8 ( @return The value read. =20 **/ -__inline__ UINT16 EFIAPI IoRead16 ( @@ -117,7 +114,6 @@ IoRead16 ( @return The value written the I/O port. =20 **/ -__inline__ UINT16 EFIAPI IoWrite16 ( @@ -145,7 +141,6 @@ IoWrite16 ( @return The value read. =20 **/ -__inline__ UINT32 EFIAPI IoRead32 ( @@ -175,7 +170,6 @@ IoRead32 ( @return The value written the I/O port. =20 **/ -__inline__ UINT32 EFIAPI IoWrite32 ( --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49345): https://edk2.groups.io/g/devel/message/49345 Mute This Topic: https://groups.io/mt/36443976/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49346+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49346+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755506; cv=none; d=zoho.com; s=zohoarc; b=YjMXEYN2p7WIID2S750m+8MJ+CIClrvoy7ontT0JoKASHhobA4fPn3wZUx6R/lqBEyM84q8y+GRe+DB4+WZJfpgMhsj6Q3vOrQwXZkatQfJIHy+thnWReKSHn+7+um7zHFuokgdOimZUmmZXfsm0wSi7ZqfHbZZFYmTOSkQJ91U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755506; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=CveUf1thLnCnteYd2FH/V8bnu+SYVVROk59UusA8IgQ=; b=fjBs+BTLfWoyleSbed+6Kih/8AoMy7Ry89QupFae1X3bfkbuoPk/x9fjQ+rJZDdxV0HvxBTbG8MJkSRrkBIyzRpl+56ubCPzS2An0mQW7aPSmew+Syg9fDRCwvUKCRXQLsxpZRY6f8FX2MwqM62DlcUI+mMIG+CzMvWGs2xGASs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49346+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1571755506303929.0735737438088; Tue, 22 Oct 2019 07:45:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hUbbYY1788612xjSb1x23S79; Tue, 22 Oct 2019 07:45:05 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web12.5508.1571755501146194187 for ; Tue, 22 Oct 2019 07:45:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:45:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139500" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:44:59 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 06/11] MdeModulePkg LzmaCustomDecompressLib: Update macro to be same in CLANG tool Date: Tue, 22 Oct 2019 22:44:00 +0800 Message-Id: <20191022144406.6996-7-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: Gcja9OtzlO1cB8MJiXJEH7AWx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755505; bh=xEkYEgmIu8FIJtOCPXpguRiwwogDR2BhHAbJr1ajhMU=; h=Date:From:Reply-To:Subject:To; b=Qntli2ii7fepmQoO7SwAW8lM7zzOhl4HyzTbmGaRTRUiCRB6QbREcl/oM/eEGSXtaUA +lleuLyu5RE0egmARbwlSYDE0LAzsCjNhGjFdAmZtW1fQ65Jw/hqXbmTrh5g0jg+NcpTr ZveL3AtGIJQv2wi6i5yfB48NP/3sB5+4VOc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 Define the same macro in the different OS. It can make CLANG generate the s= ame image in the different host OS. Signed-off-by: Liming Gao Reviewed-by: Hao A Wu --- MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h b= /MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h index ac06278002..c89b5c2433 100644 --- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h +++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h @@ -118,7 +118,7 @@ typedef int Bool; #define MY_STD_CALL #endif =20 -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) =20 #if _MSC_VER >=3D 1300 #define MY_NO_INLINE __declspec(noinline) --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49346): https://edk2.groups.io/g/devel/message/49346 Mute This Topic: https://groups.io/mt/36443977/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49347+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49347+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755506; cv=none; d=zoho.com; s=zohoarc; b=IBQtMCg3vfAv5mTpmySlUiw6sZ4VJi+jvSx8bUuBr2dzNz4Kw6s69FBEVfZp1aRDe8vZ1Sse+CZScPt7C/rW9p79nLHuoZ4J4JjV/9OeUCn0Hiv1iuMpr+liROQCN81/UUFQ4H4UpF3yFxLYJ04JD0Qh9I40ShDamKvVhw2Ik9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755506; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=BfleNNe9UircpX9V+aKL4/3xKcyNtYfdk39SiyfxH3E=; b=W7Eh6VC3ZM2M2QgJ0/0qMZ3LEMMlWsojLn9XvnDD93LMefF2XpInGgobxh27gM8Eh/78ZCW+9czgwQsHMue0rCPBbo9RRjFJHo/AvvZHL5+dfEgEeQtxYe9ndWgW+pMU/4i+1zb4UsyJFcud3xp+T+FdsqzIbKluM2agW78kHy8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49347+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1571755506505148.10125281163073; Tue, 22 Oct 2019 07:45:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id GlZzYY1788612xG0esZsTdhj; Tue, 22 Oct 2019 07:45:05 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web12.5510.1571755502136308385 for ; Tue, 22 Oct 2019 07:45:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:45:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139501" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:45:00 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 07/11] MdeModulePkg RegularExpressionDxe: Disable warning for CLANG9 tool chain Date: Tue, 22 Oct 2019 22:44:01 +0800 Message-Id: <20191022144406.6996-8-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: BSGxb60I7WqHizQzx3Qvtuiux1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755505; bh=cWyewz0t79eDtYnJ2s9F2zaqq2vBbSHv8DNtDn8CIpU=; h=Date:From:Reply-To:Subject:To; b=YxpUjz3tGpTqACOEz2LaNvSrqZENuQ2I8/+2GCgzgtFGsoCwbXQ9blC7HreE/+42E53 e02CYW4TQwsTRpBo/RFX0ckZhmEjasol/vdEbMjMtXKrMnEEmRM0xXsQMzmxZGVozJq9I fMctXkILz0dnrHgnjDMeD2B1m0N7S6WJK7g= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 Signed-off-by: Liming Gao Reviewed-by: Hao A Wu --- MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf | 3 += ++ 1 file changed, 3 insertions(+) diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionD= xe.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.i= nf index 883d5f1127..e9c885465d 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf +++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf @@ -107,6 +107,9 @@ # Oniguruma: tag_end in parse_callout_of_name GCC:*_*_*_CC_FLAGS =3D -Wno-error=3Dmaybe-uninitialized =20 + # Oniguruma: implicit conversion from 'UINTN' (aka 'unsigned long long')= to 'long' + GCC:*_CLANG9_*_CC_FLAGS =3D -Wno-error=3Dconstant-conversion + # Not add -Wno-error=3Dmaybe-uninitialized option for XCODE # XCODE doesn't know this option XCODE:*_*_*_CC_FLAGS =3D --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49347): https://edk2.groups.io/g/devel/message/49347 Mute This Topic: https://groups.io/mt/36443978/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49348+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49348+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755505; cv=none; d=zoho.com; s=zohoarc; b=Q64pG0/IGMol+3dEvYy/u7U8/DnMlouQ144NwZsD7JiVo8EBDkp2XKAXu7OqbH99RdGMZ0QAxIJ7UgPATP85qf+TvkTS9yeWag8EZ9IPX9iUUrTuHMsItg7hIcWnH379ySacY8UHvNUf+QKV0nLtdzmJjQyHep2smYOYt0EvI8k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755505; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=VJymABlk+oUQsB1HPgrrIPfLmq4IzlkIBpt7lwUdhZY=; b=I0angXp/DyMxrSEFuho0aghcutof2YWDdoTfd6gbrpVZygSwjSjsc1ILJp8vbUUKbPXjYSJv+hxUtqgbDn9jiumZP3QB34bDpCx0Yty+Yly9OHOcNCJJFSpCxQ/xzeWGU2NfKRJWvEtinmkLQJb3ssJLbc5l9xPpvN8sWxdlOfQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49348+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1571755505928443.0853799183634; Tue, 22 Oct 2019 07:45:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id N1mbYY1788612xosLWJXyAWA; Tue, 22 Oct 2019 07:45:04 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web12.5508.1571755501146194187 for ; Tue, 22 Oct 2019 07:45:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:45:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139507" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:45:01 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 08/11] CryptoPkg: Append options to make CLANG9 tool chain pass build Date: Tue, 22 Oct 2019 22:44:02 +0800 Message-Id: <20191022144406.6996-9-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: hyKUz7F5MuPcxtMg5otklNG2x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755504; bh=5ZgMEwIZyyD/6p/0Riyhnuo4p4URSwNGmTAoM2ImGfc=; h=Date:From:Reply-To:Subject:To; b=gusCipRMTROLPz6C3OAgoM1lUUZ193cqI5RiLVZJCXX8+PCFazVSut3IdcZGa4q+oUb 09lj6z8jewjIRYDhdYj3me3R+EpqR40bD0XkG0SkQu9EQjzHv7ZLjOrdPXYHCWGl2jn/K d8Tjr8WLaaclqIBqKfRlWXt5Z6Z1+8WjOso= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 Disable warning reported from CLANG9. Signed-off-by: Liming Gao Reviewed-by: Jian J Wang --- CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 1 + CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf | 1 + CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 1 + CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 1 + CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 + CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 1 + 6 files changed, 6 insertions(+) diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Li= brary/BaseCryptLib/BaseCryptLib.inf index 8d4988e8c6..a98be2cd95 100644 --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -101,5 +101,6 @@ =20 GCC:*_CLANG35_*_CC_FLAGS =3D -std=3Dc99 GCC:*_CLANG38_*_CC_FLAGS =3D -std=3Dc99 + GCC:*_CLANG9_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Dincompatible-pointer= -types =20 XCODE:*_*_*_CC_FLAGS =3D -std=3Dc99 diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Lib= rary/BaseCryptLib/PeiCryptLib.inf index 3da8bd8480..7b07dd13d2 100644 --- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf @@ -96,5 +96,6 @@ =20 GCC:*_CLANG35_*_CC_FLAGS =3D -std=3Dc99 GCC:*_CLANG38_*_CC_FLAGS =3D -std=3Dc99 + GCC:*_CLANG9_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Dincompatible-pointer= -types =20 XCODE:*_*_*_CC_FLAGS =3D -std=3Dc99 diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg= /Library/BaseCryptLib/RuntimeCryptLib.inf index 21a481eb77..d9e29ef660 100644 --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf @@ -107,5 +107,6 @@ =20 GCC:*_CLANG35_*_CC_FLAGS =3D -std=3Dc99 GCC:*_CLANG38_*_CC_FLAGS =3D -std=3Dc99 + GCC:*_CLANG9_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Dincompatible-pointer= -types =20 XCODE:*_*_*_CC_FLAGS =3D -std=3Dc99 diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Lib= rary/BaseCryptLib/SmmCryptLib.inf index 7c187e21b3..b4faaf3f80 100644 --- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf @@ -104,3 +104,4 @@ =20 GCC:*_CLANG35_*_CC_FLAGS =3D -std=3Dc99 GCC:*_CLANG38_*_CC_FLAGS =3D -std=3Dc99 + GCC:*_CLANG9_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Dincompatible-pointer= -types diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Librar= y/OpensslLib/OpensslLib.inf index 7432321fd4..b40d82783b 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -662,6 +662,7 @@ GCC:*_*_AARCH64_CC_FLAGS =3D $(OPENSSL_FLAGS) -Wno-error=3Dmaybe-uniniti= alized -Wno-format -Wno-error=3Dunused-but-set-variable GCC:*_CLANG35_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Duninitialized GCC:*_CLANG38_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Duninitialized + GCC:*_CLANG9_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Duninitialized -Wno-e= rror=3Dincompatible-pointer-types -Wno-error=3Dpointer-sign -Wno-error=3Dim= plicit-function-declaration -Wno-error=3Dignored-pragma-optimize =20 # suppress the following warnings in openssl so we don't break the build= with warnings-as-errors: # 1295: Deprecated declaration - give arg types diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/= Library/OpensslLib/OpensslLibCrypto.inf index 8134b45eda..0a60196c8a 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -610,6 +610,7 @@ GCC:*_*_AARCH64_CC_FLAGS =3D $(OPENSSL_FLAGS) -Wno-error=3Dmaybe-uniniti= alized -Wno-format -Wno-error=3Dunused-but-set-variable GCC:*_CLANG35_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Duninitialized GCC:*_CLANG38_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Duninitialized + GCC:*_CLANG9_*_CC_FLAGS =3D -std=3Dc99 -Wno-error=3Duninitialized -Wno-e= rror=3Dincompatible-pointer-types -Wno-error=3Dpointer-sign -Wno-error=3Dim= plicit-function-declaration -Wno-error=3Dignored-pragma-optimize =20 # suppress the following warnings in openssl so we don't break the build= with warnings-as-errors: # 1295: Deprecated declaration - give arg types --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49348): https://edk2.groups.io/g/devel/message/49348 Mute This Topic: https://groups.io/mt/36443979/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49349+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49349+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755508; cv=none; d=zoho.com; s=zohoarc; b=HxRabLnmToR5ywvSuFZZ+NYPdNaFnDLffFJi8zDR33V7dPsUVB3J9etE8Kelgj47gCRIF2gpZqTeLy1tfGAvABh+UZoZ8pRgJ5PPkHLd4CtFlsauu7bKmqfRTB+gtCO5TeWBd00d22CptrrV0vWF8EeZuQqrXplXqwx8iyeQqbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755508; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=afISGpzOYlzQSRORq+oqG3brR2Ewpd39AUFHYKSF4/U=; b=dEC4H4h9tb2c0/CmlpkLF/xkV0x1BKX2u7uupvV07+VkgtLaDlhgJyRg/xsu68PBChXsTK+wTzUHTNdlEbhc5G+W1XYLte7OLfNlnkaBsGrgIyF4sdHwhRcrYpB9jUkjeeb1bDltupFw88SAUXdsQ6Z+6qAU6RARoIrFkNfQBbs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49349+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1571755508433673.8314160592604; Tue, 22 Oct 2019 07:45:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id vC5RYY1788612xtQ4vnWmkyc; Tue, 22 Oct 2019 07:45:07 -0700 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web09.5483.1571755503106084722 for ; Tue, 22 Oct 2019 07:45:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:45:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139514" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:45:01 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 09/11] CryptoPkg IntrinsicLib: Make _fltused always be used Date: Tue, 22 Oct 2019 22:44:03 +0800 Message-Id: <20191022144406.6996-10-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: 98a4WJkxE77W0FpkzcpYs6izx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755507; bh=/9Y7QpOA0hhhxFKbUjT33XHIsnW3swyLJzIngCNCaGU=; h=Date:From:Reply-To:Subject:To; b=X/xP/5TbxdHVQLf8sRCEH791ie8efvPQt/Vb5opNzJt/jJuMYjzfDavYUXio/IC/Lof cRv0SJUS+/IWYJxTT32CjFZDGUnOm9UcQbVg4MICi29gXQcMesh5PXorAF62OW6/0Awv8 CJis9SEBB2JxOIaL9D2OENzzQxM+C65qZhE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 With this change, global variable _fltused will not be removed by LTO Signed-off-by: Liming Gao Reviewed-by: Jian J Wang Reviewed-by: Philippe Mathieu-Daude --- CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPkg/= Library/IntrinsicLib/MemoryIntrinsics.c index 6e4d4a68cc..94fe341bec 100644 --- a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c +++ b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c @@ -2,7 +2,7 @@ Intrinsic Memory Routines Wrapper Implementation for OpenSSL-based Cryptographic Library. =20 -Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -13,9 +13,15 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 typedef UINTN size_t; =20 +#if defined(__GNUC__) || defined(__clang__) + #define GLOBAL_USED __attribute__((used)) +#else + #define GLOBAL_USED +#endif + /* OpenSSL will use floating point support, and C compiler produces the _f= ltused symbol by default. Simply define this symbol here to satisfy the linker= . */ -int _fltused =3D 1; +int GLOBAL_USED _fltused =3D 1; =20 /* Sets buffers to a specified character */ void * memset (void *dest, int ch, size_t count) --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49349): https://edk2.groups.io/g/devel/message/49349 Mute This Topic: https://groups.io/mt/36443980/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49350+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49350+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755505; cv=none; d=zoho.com; s=zohoarc; b=Z2zkuvrOKyDdwLD6oeg6vEQpOi1l8QyyCcfyrYOCBlz+91EHWodZtpL+P9saw1Qr3sppGZE0odcF9zrDxYJvKr3otX3Ukbd+uFcT37eMIJlyHQRTinOe+y1BkLQIJpYa5n1yD7yidxeLaS0CrKh/PMd6SR5dneypq4t0SHjUI5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755505; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=30ho0vJFjEql1hJJNypiRMKL5j75G5cpaNF7Vww/e2Q=; b=eXpyOaq0sHcPOtMwS3ao4XBilJEObxUnM4NyB7ZmfK2NiFM8h/Q4KGdLb9Bjr4aFci1maXAS8FLIzDNvPmZkL0ZwBECD6Utkt0pIMDoFZ2z3plOhavSFt+A7U2bRsgkSugAeXecBPM+S8OD6Et30kdUMKgX6chAZQCg9j9/Ncag= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49350+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 157175550595626.756305202567432; Tue, 22 Oct 2019 07:45:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id uroeYY1788612xd2eJN4ux1j; Tue, 22 Oct 2019 07:45:05 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web09.5483.1571755503106084722 for ; Tue, 22 Oct 2019 07:45:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:45:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139537" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:45:02 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Jordan Justen , Andrew Fish , Ray Ni Subject: [edk2-devel] [Patch 10/11] EmulatorPkg: Enable CLANG9 tool chain Date: Tue, 22 Oct 2019 22:44:04 +0800 Message-Id: <20191022144406.6996-11-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: aMgYZSDk06oQ2j00YgfFTtsCx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755505; bh=DS3PEX0bt4ijcYWqkw4B1cvL+IW6Y+PcF/wdJHEzPpE=; h=Cc:Date:From:Reply-To:Subject:To; b=vzCWC5LkZL90iJv8if63479EnxPXJJos5ZcNdVUs2FVEAD+Yw1wu9sFCc7q/RK/oNog ScCCrUcW+01C17+82xC1GLmRE92+qKhyhFuBZNhSXDom1Bc3mH5L4uxkh+stlfnM+Yvq7 W+XVK+MWIvGkFNifLrBB3eCS2jG2ei5mhxc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 1. Add WIN_SEC_BUILD macro check for CLANG9 tool chain build -p EmulatorPkg\EmulatorPkg.dsc -a IA32 -DWIN_SEC_BUILD=3DTRUE -t CLAN= G9 build -p EmulatorPkg\EmulatorPkg.dsc -a X64 -DWIN_SEC_BUILD=3DTRUE -t CLANG9 2. Append CLANG CC and LINK flags to generate windows HOST. 3. Fix WinHost issue to call GetProcessAffinityMask() API. The input parameter should be UINTN pointer instead of UINT32 pointer. Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Signed-off-by: Liming Gao Reviewed-by: Ray Ni --- EmulatorPkg/Win/Host/WinHost.c | 6 +++--- EmulatorPkg/EmulatorPkg.dsc | 14 +++++++++++++- EmulatorPkg/Win/Host/WinHost.inf | 6 ++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c index 9aba3c8959..e40ce32548 100644 --- a/EmulatorPkg/Win/Host/WinHost.c +++ b/EmulatorPkg/Win/Host/WinHost.c @@ -356,7 +356,7 @@ Returns: INTN EFIAPI main ( - IN INTN Argc, + IN INT Argc, IN CHAR8 **Argv, IN CHAR8 **Envp ) @@ -391,8 +391,8 @@ Returns: VOID *SecFile; CHAR16 *MemorySizeStr; CHAR16 *FirmwareVolumesStr; - UINT32 ProcessAffinityMask; - UINT32 SystemAffinityMask; + UINTN ProcessAffinityMask; + UINTN SystemAffinityMask; INT32 LowBit; =20 // diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 20f1187713..109685b062 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -237,9 +237,11 @@ =20 [Components] !if "IA32" in $(ARCH) || "X64" in $(ARCH) - !if "MSFT" in $(FAMILY) + !if "MSFT" in $(FAMILY) || $(WIN_HOST_BUILD) =3D=3D TRUE ## # Emulator, OS WIN application + # CLANG9 is cross OS tool chain. It depends on WIN_HOST_BUILD flag + # to build WinHost application. ## EmulatorPkg/Win/Host/WinHost.inf !else @@ -419,7 +421,17 @@ =20 MSFT:DEBUG_*_*_CC_FLAGS =3D /Od /Oy- MSFT:NOOPT_*_*_CC_FLAGS =3D /Od /Oy- + GCC:DEBUG_CLANG9_*_CC_FLAGS =3D-O0 -Wno-unused-command-line-argument -Wn= o-incompatible-pointer-types -Wno-enum-conversion -Wno-incompatible-pointer= -types -Wno-sometimes-uninitialized -Wno-constant-conversion -Wno-main-retu= rn-type =20 MSFT:*_*_*_DLINK_FLAGS =3D /ALIGN:4096 /FILEALIGN:4096 /SUBSYSTEM:CO= NSOLE MSFT:DEBUG_*_*_DLINK_FLAGS =3D /EXPORT:InitializeDriver=3D$(IMAGE_ENTRY_= POINT) /BASE:0x10000 MSFT:NOOPT_*_*_DLINK_FLAGS =3D /EXPORT:InitializeDriver=3D$(IMAGE_ENTRY_= POINT) /BASE:0x10000 + +!if $(WIN_HOST_BUILD) =3D=3D TRUE + # + # CLANG9 tool chain depends on WIN_HOST_BUILD flag to generate the windo= ws application. + # + GCC:*_CLANG9_*_DLINK_FLAGS =3D /ALIGN:4096 /FILEALIGN:4096 /SUBSYSTE= M:CONSOLE + GCC:DEBUG_CLANG9_*_DLINK_FLAGS =3D /EXPORT:InitializeDriver=3D$(IMAGE_EN= TRY_POINT) /BASE:0x10000 + GCC:NOOPT_CLANG9_*_DLINK_FLAGS =3D /EXPORT:InitializeDriver=3D$(IMAGE_EN= TRY_POINT) /BASE:0x10000 +!endif diff --git a/EmulatorPkg/Win/Host/WinHost.inf b/EmulatorPkg/Win/Host/WinHos= t.inf index 631d5a6470..1adca10d79 100644 --- a/EmulatorPkg/Win/Host/WinHost.inf +++ b/EmulatorPkg/Win/Host/WinHost.inf @@ -95,3 +95,9 @@ MSFT:*_VS2017_X64_DLINK_FLAGS =3D /LIBPATH:"%VCToolsInstallDir%lib\= x64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%W= indowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE = /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel= 32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib = Advapi32.lib MSFT:*_*_X64_ASM_FLAGS =3D=3D /nologo /W3 /WX /c /Cx /Zd /W0 = /Zi MSFT:*_*_X64_ASMLINK_FLAGS =3D=3D /link /nologo + + GCC:*_CLANG9_X64_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).exe" /= base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"%UniversalCRT= SdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDK= LibVersion%\um\x64" /LIBPATH:"%VCToolsInstallDir%lib\x64" /NOLOGO /SUBSYS= TEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /OPT:REF /DEBUG /MACHINE:AMD64 Kern= el32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.li= b Advapi32.lib /lldmap /EXPORT:InitializeDriver=3D_ModuleEntryPoint + GCC:*_CLANG9_X64_CC_FLAGS =3D=3D -m64 -g -fshort-wchar -fno-strict-alias= ing -Wall -c -include AutoGen.h -D _CRT_SECURE_NO_WARNINGS -Wnonportable-in= clude-path -D UNICODE -D _CRT_SECURE_NO_DEPRECATE + + GCC:*_CLANG9_IA32_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).exe" = /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /LIBPATH:"%UniversalCRT= SdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDK= LibVersion%\um\x86" /LIBPATH:"%VCToolsInstallDir%ib\x86" /NOLOGO /SUBSYST= EM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /OPT:REF /DEBUG /MACHINE:I386 Kernel= 32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib = Advapi32.lib /lldmap /EXPORT:InitializeDriver=3D_ModuleEntryPoint + GCC:*_CLANG9_IA32_CC_FLAGS =3D=3D -m32 -g -fshort-wchar -fno-strict-alia= sing -Wall -c -include AutoGen.h -D _CRT_SECURE_NO_WARNINGS -Wnonportable-i= nclude-path -D UNICODE -D _CRT_SECURE_NO_DEPRECATE --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49350): https://edk2.groups.io/g/devel/message/49350 Mute This Topic: https://groups.io/mt/36443981/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 18:58:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49351+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49351+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571755508; cv=none; d=zoho.com; s=zohoarc; b=YkNo0XgbfUCaEPhrPv8h8iZ87meLPXsfLDwy/BrHhqkdjasxEh2sVjLUikY9ddgFj2yaLjuJSuM43fS0OHADGXftTWq5eAhRhz5OgYUYoU8vEFyEX9kxp5oPLDd12NbCkxr2DJjYINHl58LsX91hEh3TYTaCxY9MfT8QlbweYfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571755508; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=cUKfIh8kWs+UVy/qYvDqrWw1Ol9eMnYKCB/tdR6vEVc=; b=effvmL4hWiTpThHdi/+pY94l4WZeBP+Cwk74/R3JFKj7t39Zz1AhsZANDBd3DAXIeTxdn2e8S/6xA/x1HSY/IQ40QT4dO1UaIFmT64kUY9d1x2Z00FSmMlzG5DuVIGjyt0aa/Di+ltDr/r/hWK0Yj76usVFJWWgRoxD939S4vyI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49351+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1571755508945110.12699757304142; Tue, 22 Oct 2019 07:45:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id abkqYY1788612x1HL74VjRE2; Tue, 22 Oct 2019 07:45:08 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web09.5483.1571755503106084722 for ; Tue, 22 Oct 2019 07:45:04 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Oct 2019 07:45:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,327,1566889200"; d="scan'208";a="197139539" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.31.203]) by fmsmga007.fm.intel.com with ESMTP; 22 Oct 2019 07:45:03 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch 11/11] OvmfPkg: Enable CLANG9 tool chain Date: Tue, 22 Oct 2019 22:44:05 +0800 Message-Id: <20191022144406.6996-12-liming.gao@intel.com> In-Reply-To: <20191022144406.6996-1-liming.gao@intel.com> References: <20191022144406.6996-1-liming.gao@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,liming.gao@intel.com X-Gm-Message-State: AkE8iO7QWnYbTOFcW2XH11ywx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571755508; bh=c332B6usPOlxB8U/9RYoGqDfxFvlXdBx1RR5F3nhs2g=; h=Date:From:Reply-To:Subject:To; b=Hp5OZBzpAGjv1B3CCSY6bmGInCeHczuakszfG7tbV1CAWtwHXDiV3l2Df9gMuLls2sN K5I4vDzxUH24wT6QEY2rNr8tAg/iT9GQXXZQw0Rc7fL7Gr9jB8BJ+g0UtAoz36ojbj19G YMSaomVq+w7015c2umgwvB+G3yuFkRXj3As= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1603 1. Apply CLANG9 Linker option. 2. Exclude -mno-mmx -mno-sse compiler option for CLANG9 These two options will cause CLANG Linker crush. Signed-off-by: Liming Gao Reviewed-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 4 +++- OvmfPkg/OvmfPkgIa32X64.dsc | 4 +++- OvmfPkg/OvmfPkgX64.dsc | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 66e944436a..0fde8e6e84 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -66,7 +66,7 @@ GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG MSFT:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" && $(TOOL_CHAIN_TAG) !=3D "CLANG9" GCC:*_*_*_CC_FLAGS =3D -mno-mmx -mno-sse !endif =20 @@ -80,12 +80,14 @@ [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D + CLANGPE: *_*_*_DLINK_FLAGS =3D /ALIGN:4096 =20 # Force PE/COFF sections to be aligned at 4KB boundaries to support page l= evel # protection of DXE_SMM_DRIVER/SMM_CORE modules [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_C= ORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D + CLANGPE: *_*_*_DLINK_FLAGS =3D /ALIGN:4096 =20 ##########################################################################= ###### # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 51c2bfb44f..c17329878e 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -66,7 +66,7 @@ GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG MSFT:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" && $(TOOL_CHAIN_TAG) !=3D "CLANG9" GCC:*_*_*_CC_FLAGS =3D -mno-mmx -mno-sse !endif !ifdef $(SOURCE_DEBUG_ENABLE) @@ -85,12 +85,14 @@ [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D + CLANGPE: *_*_*_DLINK_FLAGS =3D /ALIGN:4096 =20 # Force PE/COFF sections to be aligned at 4KB boundaries to support page l= evel # protection of DXE_SMM_DRIVER/SMM_CORE modules [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_C= ORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D + CLANGPE: *_*_*_DLINK_FLAGS =3D /ALIGN:4096 =20 ##########################################################################= ###### # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index ba7a758844..af91265d05 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -66,7 +66,7 @@ GCC:RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG INTEL:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG MSFT:RELEASE_*_*_CC_FLAGS =3D /D MDEPKG_NDEBUG -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" && $(TOOL_CHAIN_TAG) !=3D "CLANG9" GCC:*_*_*_CC_FLAGS =3D -mno-mmx -mno-sse !endif !ifdef $(SOURCE_DEBUG_ENABLE) @@ -85,12 +85,14 @@ [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D + CLANGPE: *_*_*_DLINK_FLAGS =3D /ALIGN:4096 =20 # Force PE/COFF sections to be aligned at 4KB boundaries to support page l= evel # protection of DXE_SMM_DRIVER/SMM_CORE modules [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_C= ORE] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 XCODE:*_*_*_DLINK_FLAGS =3D + CLANGPE: *_*_*_DLINK_FLAGS =3D /ALIGN:4096 =20 ##########################################################################= ###### # --=20 2.13.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#49351): https://edk2.groups.io/g/devel/message/49351 Mute This Topic: https://groups.io/mt/36443982/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-