From nobody Tue May 7 11:55:14 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+48953+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+48953+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099243; cv=none; d=zoho.com; s=zohoarc; b=ldHIPvsPQg//rM4lT7IGiopq2Q2p8FG4uxRWNaHewRtN1Pu+M197/9kRt9uiiQM2cJ/K2SsesAf3O8D/1CWMLvto4VyGe4vE/kCWDWfPJeAl3R/oWVX+Kaq/zIWsnWgywhmul2ffvC4ldvV0+wmf2j457ZxmXsCjopQ5GG+euvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099243; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=mwd2CUGrzWFRG3JKW5opNXLTsu58x371dD5tHRCGlh4=; b=iIqVq6t3JQY1XZVIbBk8VrkY7buP7XN+4xWtg49ZTHUwl1G/Oe1gd/3WPHfu8DR8ZcWXJ1tmqHZfsT07dNE3RgU5rsJLBKGvn2CRlDhDIaNsKsH3gPU5zT3Gx07s6/RUKm6WIE3FvUrRnGZNfs7VrZSXtDvS00MjYFITY8KnbA0= 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+48953+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 1571099243370968.6180166331394; Mon, 14 Oct 2019 17:27:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id dc6aYY1788612xMKbDC39Pev; Mon, 14 Oct 2019 17:27:22 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363324" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:21 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 01/11] BaseTools tools_def.template: Remove unnecessary $(DEST_DIR_DEBUG) path Date: Tue, 15 Oct 2019 08:26:40 +0800 Message-Id: <1571099210-12432-2-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: RN0nXLZF7NaXRlU78Q4TurIrx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099242; bh=5K2amDSLR9qOkgOg/r8wARu98MtOE7x9bEB+yoLS46U=; h=Date:From:Reply-To:Subject:To; b=E76w+IEbsTj4ZFsGXhXTaoMCiRyRYWtLP8Wx+qkMQI/AfnUZWxAyHa7RT6nWxBL8Ayj oPybIawuo78RPhzcXeq3RqlHPB1adMLymOAGyQ4LljeLoWqlXC8rcPkzz/qmrLY3UAPGY TJ3YlEUzrKTKf+uOTJ2v7SXBKGAOaicZS4w= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" $(DEST_DIR_DEBUG) path is in Include directory. It is not required to be specified again. Signed-off-by: Liming Gao Reviewed-by:=C2=A0 Bob Feng < bob.c.feng@intel.com > --- 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 (#48953): https://edk2.groups.io/g/devel/message/48953 Mute This Topic: https://groups.io/mt/34540582/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 Tue May 7 11:55:14 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+48954+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+48954+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099243; cv=none; d=zoho.com; s=zohoarc; b=DByAYqAAxBEFynrfSUcOLptwe/El+GpHhkuUqFSoTc4bjFbQngX8zjsRqGuxRrNuo91+MigHiu6WpH1JLPZ2JamNniNpcPFpvjSKkda55ov3tRrw+w1u/h9Uwa0h0r54fRztEcDLK9WWpqthqmGt4IK0Tbl210keA3ZpIXaC+xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099243; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=PGU7ak7HJy9fZSWAkl9LjCF0LXLFMgiyShaViGbwXGw=; b=CkRkISZDwPh4LrBBxOfIx/HPgWv27A2g+YqfnJp92gS7xVHsZId6ypu2PJOXxqlAUaGc1+l47Ax6Fan35/AcpxMvS/VMH/oYJ7Mi4HtGk+brLDNVVJ/uGrtvgTGTgHs/LzYnUuqzAFwY8F8/r/qaWYLgv/aPbiivA46Rrtv/SQA= 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+48954+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 1571099243800450.47860021778615; Mon, 14 Oct 2019 17:27:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id AEYBYY1788612xlyQOnV1WgY; Mon, 14 Oct 2019 17:27:23 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363326" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:21 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 02/11] BaseTools tools_def: Add CLANG9 tool chain to directly generate PE image Date: Tue, 15 Oct 2019 08:26:41 +0800 Message-Id: <1571099210-12432-3-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: YYPRjr446bsnrZiHSVQzucacx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099243; bh=RdSNe3B5HfReDEogMMmC35pJfGfE8892bAKH3CdTNuw=; h=Date:From:Reply-To:Subject:To; b=i5bMlpAA9xoxm8qvs4wZVI6YFbhmNcEG8bu9fLh0wmf/oF6mmq8MKy3nRNe8fKQAWIW h0bc/7Tj4/fMLAYpeetp+1SqNCH+GFQAzftVE/nQMIskVj2YWWp2Nlxhwu07TLna6xoq0 Z6Ovlr286YP86EVN0czy+dKC71Ko6lt92tM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Liming Gao --- 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..e009f195b9 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(GCC5_ASM_FLAGS) -m32 -march=3Di= 386 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=20 + +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=20 + +########################## +# 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(GCC5_ASM_FLAGS) -m64 DEF(CLANG9_= X64_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=20 + +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=20 + +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 # --=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 (#48954): https://edk2.groups.io/g/devel/message/48954 Mute This Topic: https://groups.io/mt/34540583/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 Tue May 7 11:55:14 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+48955+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+48955+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099244; cv=none; d=zoho.com; s=zohoarc; b=GBdIPs0//FsaI9I8hwFEMNryCipTJNtxYQ8ngHkofMY1Xup622n2r5wAcNT1kkIS/kp1coekTe8nCkvpr4zBWT1OKjPt+6aVTJ467/Z4H8QgGnJN0AjlkINCqaTan22c5ZPH4Z95jrPzdq/AHcxJwaLwXi7bDr6duj0UlQ/d+/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099244; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=ycAuRLhArlq01Fg7mlK9DwvDtlJYnRG/mj/AOURzDhY=; b=Sbzd92JoXyKKA6UOIBhpuOh+x0coGWVB2uan+dtMepoJuabD6Z+Swr2G1SonSznXoOx5atFBKNhx1YkGHooIYtZKOGoPI1nXyRPSBIdusOMqb0DSvcdd2Fs9cwC4b+L9MSfaeX9ptdBf2qECaZrX7eSVMJDm8OsOoa4fm9CGet8= 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+48955+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 1571099244040679.0803869102074; Mon, 14 Oct 2019 17:27:24 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8DbiYY1788612xaTlMVyWFlE; Mon, 14 Oct 2019 17:27:23 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:23 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363335" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:22 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 03/11] BaseTools GenFw: Fix the issue to update the wrong size as SectionSize Date: Tue, 15 Oct 2019 08:26:42 +0800 Message-Id: <1571099210-12432-4-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: PTPdlvqAddT5YHnLMOzg5196x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099243; bh=cTmp3JAX8Ra8hi0yULSMGqAmbQCYd533x8D784lI+Zs=; h=Date:From:Reply-To:Subject:To; b=L9q1fMzhM/KQanocy61TZyyG7hrkC8tQFCNDZJ03G0DELIebBGhYX6QtDnQr9xe5uWH U8e9maXuscP1N5nU8maejIxxNFKeak9Ufs9sFdIuU7HVvgyN+Q8HCs7ZsIk+kG5UOC9z+ JkuY9zA9DRFKENUewYZbAUq8XLVCiIxynks= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Liming Gao 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..d8d3360c24 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; + } + =20 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 (#48955): https://edk2.groups.io/g/devel/message/48955 Mute This Topic: https://groups.io/mt/34540584/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 Tue May 7 11:55:14 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+48956+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+48956+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099244; cv=none; d=zoho.com; s=zohoarc; b=TMuiuG1MjaF7Fhle1/BKzxmBsP2+lJsof1XJ6m02/xt4eGE1qhhc9pDodUiWkUmL1A7QOOtnmI03mlUD33oMdIdLc9bVuHSI5kNL3kjOB88DzynbcbFa4lE2EdzQFhTmkRK2XKFAHQo2ur/t8qqgGOQYyDNM9m+xZyFHIgHhsvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099244; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=Y95lw8fNI3JDvg59k5iqRuLVzxr1Ndmhdf86wcucPMk=; b=hTUb0+IwAFzXu3nA55LxV3eMvmodCdGEwcd0UhwGG4IRaiP44qp/AHbmjlNFBOSW4HM5AkRTMjEk6/iNC/SCG5HfTz75KrVqFHTH69mBfBRTgBp1srWGkHva+Omep0WDCUirmEpncw7Dxm8BqjkI3zMCdawK2TVwh/6DA5Gu3eI= 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+48956+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 1571099244978648.6044198956945; Mon, 14 Oct 2019 17:27:24 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id G8bRYY1788612xgyMilS7ADh; Mon, 14 Oct 2019 17:27:24 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:23 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363343" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:23 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 04/11] MdePkg Base.h: Add definition for CLANG9 tool chain Date: Tue, 15 Oct 2019 08:26:43 +0800 Message-Id: <1571099210-12432-5-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: rfVuKTlhvy1AXPkPpXZlkngKx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099244; bh=qgVPl4ffIu6jQemLNgjvNiMltLUNLYNuF9mh5MJHLBk=; h=Date:From:Reply-To:Subject:To; b=md+q+JYm1v1h033zimzniImS0rLADnh25ZVyinuXpH7DQX59EgOvVDC5HFdEPWs9GrM xNEGKPrTHaGvyHYZ+/Gg6QHg9++6nV9OZinS5RQ8WLdAAWHEVWmm37EcTnujwVX4Bem3b O91em33OBVaRQ+cGje0P9HvSAIZujkLSfoI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Philippe Mathieu-Daude --- 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 (#48956): https://edk2.groups.io/g/devel/message/48956 Mute This Topic: https://groups.io/mt/34540586/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 Tue May 7 11:55:14 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+48957+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+48957+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099245; cv=none; d=zoho.com; s=zohoarc; b=Cmh1uq5wVGNEID370rNwIUzz6cYSr4nUcdYgLmS+c+lEtEevDyXJi+t7MduhZoca25nY6wlHb5uQqM8CuQeq33+igQBNopl6+rTuqHwID0sqRvInc27Mh7zX2nk74N9JSD7+YsEqh/GSgkLy82MoR29mMLJcMQhY/eHeiUBeYwo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099245; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=MCYIMergqy30pH6Wz+brW8Ud1sy2/lMoDvgRviE+KzA=; b=a1qJeV6MnIuFqx48UREULg80VH182gZrzv/uaA3HizJMnyZ7SwMSfgj3lLbbNoB4JugYQKrx7Cu85vbu1RriixBbGbNPV0hkEGp5LdMTdY+/C24l6W/ePnltTHRCvwU5h6cuoLfMzOB3lLWvHHG4eGUcZuMtfGatBmOsqI2aLPY= 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+48957+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 1571099245727418.49382830189654; Mon, 14 Oct 2019 17:27:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id y2xNYY1788612xVR8fq9aAiS; Mon, 14 Oct 2019 17:27:24 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:24 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363348" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:23 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 05/11] MdePkg BaseIoLibIntrinsic: Remove __inline__ attribute for IO functions Date: Tue, 15 Oct 2019 08:26:44 +0800 Message-Id: <1571099210-12432-6-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: 8RclFkKxRMx42V6S361vfFoBx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099244; bh=O55PpCFbkwW3y2boFKoRFtSzU/a2Nbf4RsD2kIdv7sI=; h=Date:From:Reply-To:Subject:To; b=j5sdX6r3UhxYdKU9UpxWjd9m+FSt2oUw+epeHyRwzUR2T5MBtr8Exw9L3Fg4aUMEFFo 2EiiHwql3BcndFyN9HLImKBdR3/MVk6Kgs8wVTyjn230/utMCvlMXKDG+ZJbJjlHugzA9 xNiw22npLu1d2646DbQNgziOvMLMm8MA/lM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" __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 Reviewed-by: Michael D Kinney Reviewed-by: Philippe Mathieu-Daude --- 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 (#48957): https://edk2.groups.io/g/devel/message/48957 Mute This Topic: https://groups.io/mt/34540587/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 Tue May 7 11:55:14 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+48958+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+48958+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099246; cv=none; d=zoho.com; s=zohoarc; b=TazabZbObwfdOIJoostk4JVwRK62pA3+jy7/emWSLs2ZQrNKQFMfAcyBbfV/kRFcT/MtYDd5jPOq9MRUR1VH5d4rxz2dB0gpvrE8btjB9dnRadWL6HyAXAY2MEnwKE9wwpfMJ2H1Xj7N7OcaIDh9lAfQWjj/lOX2FHs0vSYl9VI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099246; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=jzxLX0Ta8X1kznTHvtJA4LDZEaex91WYGWU2p4EREds=; b=HZsUEEaTowtK8ltvWFtb4TWC98XhGR+ALBs4DovwQOrSBUMzFP08tVAT27C7+Uy0sKz6vsW6gBV09n3FJcQhGBGAGZYr48hFyKiJ/pwMc8do7yC8vp6foSTGN3xKp9tomZFaDitvyQe5nYoOmAtP1SuhJ+vyoG9lIj+TYiFCdPM= 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+48958+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 1571099246775437.83731960585544; Mon, 14 Oct 2019 17:27:26 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qQD4YY1788612xzrFsYd0gpM; Mon, 14 Oct 2019 17:27:25 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:25 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363365" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:24 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 06/11] MdeModulePkg LzmaCustomDecompressLib: Update macro to be same in CLANG tool Date: Tue, 15 Oct 2019 08:26:45 +0800 Message-Id: <1571099210-12432-7-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: EfAA4qXQUGTpmqdCCeyaHHjex1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099245; bh=NIzYgs2CxRhoN/RuMgFidfrbHvGbM286VCSwAQXfI6w=; h=Date:From:Reply-To:Subject:To; b=mtGNP/7dxEhF1c1nnk/er150njD1kp6tPrgN60J5FmOARknK33F67/y/D0lIu0QcAz8 lkYfj+UhxziGZb6oZDT2+9YHNLmmnQYq/8SUV9CPBGAOpIa32hcIPsno5JnCL56XS0VZd OD3rrOVROS9DFg+5HHcpejwPPqfjk0ZGYcQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 (#48958): https://edk2.groups.io/g/devel/message/48958 Mute This Topic: https://groups.io/mt/34540588/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 Tue May 7 11:55:14 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+48959+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+48959+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099247; cv=none; d=zoho.com; s=zohoarc; b=BHw5ZZngcqRSBPh3C9UN3t+FBUs6GL1TBDBKqopQRZv5V+CpQxSKGo4MhBYkJeE9u1NgFVdrzrr9dgSlcRAyp0WvNCrzxMvFUR031MYytEciq1JF4I0CxkuQvOnWO9JEoMoDxpVqRXNtXMzEnkCgp8G6p7WJD4JNGYsT2Ue7JIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099247; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=poeQdCM+qptI4dN8mn9JU4/mR7siS3GJlTaDyHTymXE=; b=c1IaOboecnA92S77/9ScOQ4vjbBrM0vCqcTIF35A+LjLVv6O+bIf3ffW9lt5xkVJl30wHZ6qiIF5y5dkWBGLQJiWc3IYDgL7G4guWmLllPwy6smanU5FM8jC1dNtoWJQ4yityEDUGC3jjJZ/tJ5QHCcvdqjE34qwDKT0m5obRpU= 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+48959+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 1571099247493744.2919924773328; Mon, 14 Oct 2019 17:27:27 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0BbuYY1788612xfxGaDXAQW9; Mon, 14 Oct 2019 17:27:26 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:26 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363369" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:25 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 07/11] MdeModulePkg RegularExpressionDxe: Disable warning for CLANG9 tool chain Date: Tue, 15 Oct 2019 08:26:46 +0800 Message-Id: <1571099210-12432-8-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: uTswdQdxxGjFZyvJjW3dtYYQx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099246; bh=HORF0v7tYS72wb94+syXxGd/aYtkXbRhWozq4O2SkxE=; h=Date:From:Reply-To:Subject:To; b=wQUjVsK3YPpRUCh1BQESr7GxqokLTB+9RYUBmjj/HOfYlyM27RcnuGOcul3xzx2w3dP yCs+AWadBTx3HMDZW2xydH8N2+Rr4o14SWbYvXSGyyfiC+iDiPMJGO4mAQ+v/UtwwpwkN 8eH6r+NeLYWJcvrqMBx34EZWCC/4QNko2vg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 (#48959): https://edk2.groups.io/g/devel/message/48959 Mute This Topic: https://groups.io/mt/34540590/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 Tue May 7 11:55:14 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+48960+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+48960+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099247; cv=none; d=zoho.com; s=zohoarc; b=Mcq7yuuFJOiXPbBPQ1YsAM7bWR+12J+xr2ZtbhBch0Cb7Dfs6uzMg0ru3D0t5ZRE3XvDSo1VmGt6N6IPPZkl48spmnmjDkJTgW4/5EaI5r1LyXUjKXh3ZUStXfK1rVzt1SJVwx+MzU/f6/ZZaHBYdYxFrb44Zth0AzpevoOTXaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099247; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=Sw9Wn1rODPg4Zp4wd/oGlQcl90SIvKZtMxumOW9OVe4=; b=erNbn8ZQPgc0t4lh46//mx306WaA+TGqshrDbEjX02VPMD/pCSiuqdPmyS04IxOTjYqcD4vmLPJ+TiegaQ3KqK4KUr85QaW8FxudFSi2KzahQeR+ajlXDwLaOMkfgFPxzPDnL4Z0TGhe9oVGYxS1ySc9QMMJDRkowY9KfT5enoo= 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+48960+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 1571099247561356.3653570918518; Mon, 14 Oct 2019 17:27:27 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id BlrOYY1788612xa7DLDOs99u; Mon, 14 Oct 2019 17:27:27 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:26 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363380" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:25 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 08/11] CryptoPkg: Append options to make CLANG9 tool chain pass build Date: Tue, 15 Oct 2019 08:26:47 +0800 Message-Id: <1571099210-12432-9-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: n8Zs8QIk8kPwXk8krDH8oD4mx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099247; bh=erqlpQY5Gu/v3z4dyGfT8p762enGQ2GU9/DEchuFfYA=; h=Date:From:Reply-To:Subject:To; b=KdMf44yJjTGaTP3TPWNQHNe+3xtliVtC9FbCCXgclTvkDsNpFDz/58JXQzALAIYgsCs sy2Q4QxeQIVl9tqVWVr52R+4srrSOPupHPQVSn028uqMAeq3wJzh+7twVM7Jqrx8oq1TN 4qhptDWTP4KG2Q/RfR5PWOl9bV32rEiq9Mg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 (#48960): https://edk2.groups.io/g/devel/message/48960 Mute This Topic: https://groups.io/mt/34540591/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 Tue May 7 11:55:14 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+48961+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+48961+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099248; cv=none; d=zoho.com; s=zohoarc; b=n8oNgGODhH8RpC5+hNMTjlpFCDaOYtecthtVBWzGHpVgVSnOVROWkcdYxGWOJNlik8PETD2wHE3YPBoIWS/x0fA53fhTDpFMEx4EIY3Mo+zNInWLSCO7TkR7/vPUQt9l1emTw0MhWqfKz69XUktegXLTmuREn26GuquLYHSPdSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099248; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=HLLYTXh6HFp2/TPKItn/zkxp41djjQUWMvO3aEkV42g=; b=L6OrQw9nNL8vDjy8bX56vTRZvv0fMI4tGly7dyNrsSchuTT6AJBGfsulMgTGjkmOJqUFBLcyBr2r+iZdgAFrXfqp7mrryZXRJ8DuWGEKjO6ctY13GEKHUeIv8zdeXHde71g8+7xrpncVtuyhAjGw2b6ea5zxM0n1UBHLquqPjF0= 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+48961+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 1571099248463412.0535408516321; Mon, 14 Oct 2019 17:27:28 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id C3weYY1788612xd65RX3WyvJ; Mon, 14 Oct 2019 17:27:27 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:27 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363382" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:26 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 09/11] CryptoPkg IntrinsicLib: Make _fltused always be used Date: Tue, 15 Oct 2019 08:26:48 +0800 Message-Id: <1571099210-12432-10-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: Gf44vwRI2XSWNcoiskS99X9Dx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099247; bh=IUCoSgaigcxyX7s/dbPvzfix8aTyjZ9zDHo4mH+es0s=; h=Date:From:Reply-To:Subject:To; b=j5xw0XnKV7OatjlYhllfgNQ6bYp2I1c6EWUfSTDJyTg6GAz3m3RA+FgY3dT/65E7H4e L7/5UxJWfFqxd21K/n17mimTOA3N4wAh318t0WmIDqBt3JkNaqv1ayDKNV0TUPWBCYxmi 6iw0h+qx6hSipNQxAkZiVcnjpiW+jz4Xg5o= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 (#48961): https://edk2.groups.io/g/devel/message/48961 Mute This Topic: https://groups.io/mt/34540592/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 Tue May 7 11:55:14 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+48962+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+48962+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099248; cv=none; d=zoho.com; s=zohoarc; b=Xv5gNAZiZDtISYnrugVOaEn9t9SGr2X74nr9GA2tEHdoGLf1H2htbWP9T8ibPwA+Daj/njtcNF5tb5VPRcyavJwEdnF9RtAKs6JiFCvRM8EVyAWwdjEDiqkbnZbxrrvTztWEF8pq+UbRYdZM0ls+fBhSfKg0zSnYMdPpE7q1GZA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099248; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=LZDTY+5C7en1rYaIw1hjq3JhYTDetQ2/hETFyvapAx8=; b=G8ljaWTlYkvduk8MR/KvXU6YWkazbP0urV2lxz08OaOHTO+2yE3u/5n/tVHQVY428pligriDh+LddFbr/5RVZ1MapjQHxGxD4QV4ZBsqNaw7/7SmdB2d3sTIzCoD5qNcFWXLKQ05FHCVcNeOqpLXRFNvjyPR2o+8U70fqbSpZqU= 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+48962+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 1571099248867634.2370456852766; Mon, 14 Oct 2019 17:27:28 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6396YY1788612xM2s3mfF9Tq; Mon, 14 Oct 2019 17:27:28 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:28 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363384" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:27 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 10/11] EmulatorPkg: Enable CLANG9 tool chain Date: Tue, 15 Oct 2019 08:26:49 +0800 Message-Id: <1571099210-12432-11-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: pg5NJ1FHh99KoAN6Rt9adYW7x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099248; bh=aJOPNScgK76aybp0cP8TlXOYPLcNAusXfPeXh2mO4p4=; h=Date:From:Reply-To:Subject:To; b=whfo3yLFhw3qRBP4F70TfDOFZYivXUg12HQZ2vakXbGL8Z1lKUuBKmK0Dc00qKzBqlB 9Ah9+kxM3C/1nYrmCzn87ggQHUqLiPWLtIXxSjsAhYkywD/IDcgUOZltBlC50JFbOb+7T tq0UuMjBkmi5YxRZhA/i2HqurMropN7cl7U= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 1. Append CLANG CC and LINK flags to generate windows HOST. 2. Modify WinHost to move PCD getting in the late position Signed-off-by: Liming Gao --- EmulatorPkg/Win/Host/WinHost.c | 11 +++++++---- EmulatorPkg/EmulatorPkg.dsc | 8 ++++++-- EmulatorPkg/EmulatorPkg.fdf | 2 +- EmulatorPkg/Win/Host/WinHost.inf | 6 ++++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c index 9aba3c8959..d51a96de7b 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 ) @@ -405,9 +405,6 @@ Returns: AdjustTokenPrivileges(Token, FALSE, &TokenPrivileges, 0, (PTOKEN_PRIVI= LEGES) NULL, 0); } =20 - MemorySizeStr =3D (CHAR16 *) PcdGetPtr (PcdEmuMemorySize); - FirmwareVolumesStr =3D (CHAR16 *) PcdGetPtr (PcdEmuFirmwareVolume); - SecPrint ("\n\rEDK II WIN Host Emulation Environment from http://www.tia= nocore.org/edk2/\n\r"); =20 // @@ -423,6 +420,12 @@ Returns: SetProcessAffinityMask (GetCurrentProcess (), (INTN)(BIT0 << LowBit)= ); } } + =20 + // + // Move PCD getting late + // + MemorySizeStr =3D (CHAR16 *) PcdGetPtr (PcdEmuMemorySize); + FirmwareVolumesStr =3D (CHAR16 *) PcdGetPtr (PcdEmuFirmwareVolume); =20 // // Make some Windows calls to Set the process to the highest priority in= the diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc index 20f1187713..21620d4e94 100644 --- a/EmulatorPkg/EmulatorPkg.dsc +++ b/EmulatorPkg/EmulatorPkg.dsc @@ -237,7 +237,7 @@ =20 [Components] !if "IA32" in $(ARCH) || "X64" in $(ARCH) - !if "MSFT" in $(FAMILY) + !if "MSFT" in $(FAMILY) || "CLANG9" in $(TOOL_CHAIN_TAG) ## # Emulator, OS WIN application ## @@ -377,7 +377,7 @@ =20 FatPkg/EnhancedFatDxe/Fat.inf =20 -!if "XCODE5" not in $(TOOL_CHAIN_TAG) +!if "XCODE5" not in $(TOOL_CHAIN_TAG) and "CLANG9" not in $(TOOL_CHAIN_TAG) ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE @@ -419,7 +419,11 @@ =20 MSFT:DEBUG_*_*_CC_FLAGS =3D /Od /Oy- MSFT:NOOPT_*_*_CC_FLAGS =3D /Od /Oy- + GCC:DEBUG_CLANG9_*_CC_FLAGS =3D-O0 -D UNICODE -Wno-unused-command-line-a= rgument -Wno-incompatible-pointer-types -Wno-enum-conversion -Wno-incompati= ble-pointer-types -Wno-sometimes-uninitialized -Wno-constant-conversion -Wn= o-main-return-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 + 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 diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf index 295f6f1db8..59d9927d29 100644 --- a/EmulatorPkg/EmulatorPkg.fdf +++ b/EmulatorPkg/EmulatorPkg.fdf @@ -196,7 +196,7 @@ INF EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf =20 INF FatPkg/EnhancedFatDxe/Fat.inf =20 -!if "XCODE5" not in $(TOOL_CHAIN_TAG) +!if "XCODE5" not in $(TOOL_CHAIN_TAG) and "CLANG9" not in $(TOOL_CHAIN_TAG) INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif INF ShellPkg/Application/Shell/Shell.inf 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 (#48962): https://edk2.groups.io/g/devel/message/48962 Mute This Topic: https://groups.io/mt/34540593/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 Tue May 7 11:55:14 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+48963+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+48963+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571099250; cv=none; d=zoho.com; s=zohoarc; b=n8htIf2qGQvKBZ59+tXVygHI7pmWcPZDkGErU3/XrsyVrAU/7ow7z1xQm0y4wD5mD1hy/9oS2qTv1PF6qSyebO5Pb6P+7FYKtixgSu4kCZLXAPW7ohwkrK6HK7bodSeuaDWXoEZoO23MDqwCKZ6J2iuGYkoYD62niaUizJUvR10= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571099250; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=JnnosTeP0RFRs79uLw5T/G00PyYMhIuZpyIX49qwo9o=; b=mEcE14lRzJmOLo6qn4Vy6jbwdDPqIsxGNLBIZtQ8RJgCJogH6xm6bb8Fl65fQtosZDV58Vshmc36wSA/uNbse7wJSbAcZGdY0YaYCO1xDIl06lPkavavfwUyhFf2ma3+3Hl5opy3lb/yWQHQ1v5ZNnD3TMZZgR7/xLNmiMtU6Yw= 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+48963+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 1571099250003224.7228577232023; Mon, 14 Oct 2019 17:27:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 3SY3YY1788612xsgkuA5bvml; Mon, 14 Oct 2019 17:27:29 -0700 X-Received: from mga12.intel.com (mga12.intel.com []) by mx.groups.io with SMTP id smtpd.web12.2007.1571099241220744311 for ; Mon, 14 Oct 2019 17:27:29 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 17:27:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,296,1566889200"; d="scan'208";a="194363387" X-Received: from shwde7172.ccr.corp.intel.com ([10.239.158.22]) by fmsmga008.fm.intel.com with ESMTP; 14 Oct 2019 17:27:27 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v2 11/11] OvmfPkg: Enable CLANG9 tool chain Date: Tue, 15 Oct 2019 08:26:50 +0800 Message-Id: <1571099210-12432-12-git-send-email-liming.gao@intel.com> In-Reply-To: <1571099210-12432-1-git-send-email-liming.gao@intel.com> References: <1571099210-12432-1-git-send-email-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: XzerfiCzGYr6EYRfN5qYgwUqx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1571099249; bh=2/rdo1t08wKN9W6IxV4v3aD3mmGRBOLE5V9GqoKfNXE=; h=Date:From:Reply-To:Subject:To; b=oQBKFB+q2Cdv49KwF+31z4RSdbT57PllFe0UPoPjoX7RJYqkL1w+NDoSEN92pNcS7YJ Xq2EG8atfvVkkwAWJhuYCORq4JWrVlF0GH2WUd41njOgY3YNBljrssjU6C+ypD1FaZp0K jRFxImFsasrjc9ANq1BmNjSir0bDqMB6JFo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 (#48963): https://edk2.groups.io/g/devel/message/48963 Mute This Topic: https://groups.io/mt/34540594/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-