From nobody Thu May 2 04:57:58 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+44841+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+44841+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564716196; cv=none; d=zoho.com; s=zohoarc; b=Iq65S3pZrbJv/hHdbC1+KHrVGTE3JBrGwQ1LcwnTZ/57s+P2M+NtRXUnECe34wtA0w/XNevu8OzgXQ5kR699KxX5+Zl0BPdBrRoc9gzYkXqxngKPg0KNszPhkKL6owtdCy+Js10egCpfmuRTgvdGbHdjPL1vQY8uYrrvt5qPL3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564716196; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=srG0rEaX7sABvqEaIn6Hi/5RZV499lj1FwRlPIHzVks=; b=OdbDA8IiPZxmnFts5yiNn43pEI1bQKl5PnL4NaKXSwvy0O/McWkiwSQE/VJMtd0bBGhD0LMsUzxWwBBo4R/cPhcOLxcGhQFFjpoPwO5BEbXxGjtDP/q5wrlTuJ4j69+0gRLFy+EodIeMLzkdf4Fcb28OrIPjGTqF3LEJYRu69x0= 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+44841+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 1564716196646304.3439238217238; Thu, 1 Aug 2019 20:23:16 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Thu, 01 Aug 2019 20:23:15 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2019 20:23:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,336,1559545200"; d="scan'208";a="256855688" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.251.130.221]) by orsmga001.jf.intel.com with ESMTP; 01 Aug 2019 20:23:14 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Michael Kinney , Jordan Justen , Andrew Fish , Ray Ni Subject: [edk2-devel] [Patch 1/4] EmulatorPkg: Fix VS2015 build when VS2017 also installed Date: Thu, 1 Aug 2019 20:23:06 -0700 Message-Id: <20190802032309.29000-2-michael.d.kinney@intel.com> In-Reply-To: <20190802032309.29000-1-michael.d.kinney@intel.com> References: <20190802032309.29000-1-michael.d.kinney@intel.com> MIME-Version: 1.0 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,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564716196; bh=FWe2rTClwqoU1tyGl5WociyzbHDz0pA4gcKaF9JbmW0=; h=Cc:Date:From:Reply-To:Subject:To; b=bFIbblyndhqoW8bZKvaJi/LWKzIAkYD+L87oGg7/ZqSa9X+d9tP2cCt8waoOCbDRB5I qzXc06KkyylgrDvl4jf7xkdjTZohAYmuWn/ypNDVy1p9+4D/qEdhSgzoE1J2/KCzKLLzI XuQP4bnN+OUBG1VR2YHjqqP6j/XLcbvJfMs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Michael Kinney https://bugzilla.tianocore.org/show_bug.cgi?id=3D2045 * Remove INTEL family flags that are no longer used. * Remove [BuildOptions] statements that apply to all MSFT family tool chains * Update [BuildOptions] for VS2015 and VS2015x86 tool chain tags to use the correct path to tools when multiple VS20xx tool chains are installed. Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Signed-off-by: Michael D Kinney Reviewed-by: Ray Ni --- EmulatorPkg/Win/Host/WinHost.inf | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/EmulatorPkg/Win/Host/WinHost.inf b/EmulatorPkg/Win/Host/WinHos= t.inf index d61880bf76..631d5a6470 100644 --- a/EmulatorPkg/Win/Host/WinHost.inf +++ b/EmulatorPkg/Win/Host/WinHost.inf @@ -2,7 +2,7 @@ # Entry Point of Win Emulator # # Main executable file of Win Emulator that loads Sec core after initializ= ation finished. -# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.
# Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -80,24 +80,18 @@ [Pcd] gEmulatorPkgTokenSpaceGuid.PcdPeiServicesTablePage =20 [BuildOptions] - *_*_*_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" - :*_*_*_CC_FLAGS =3D=3D /nologo /W4 /WX /Gy /c /D UNICO= DE /Od /Oy- /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARN= INGS /D _CRT_SECURE_NO_DEPRECATE - *_*_*_PP_FLAGS =3D=3D /nologo /E /TC /FIAutoGen.h + MSFT:*_*_*_DLINK_FLAGS =3D=3D /out:"$(BIN_DIR)\$(BASE_NAME).e= xe" /base:0x10000000 /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" + MSFT:*_*_*_CC_FLAGS =3D=3D /nologo /W4 /WX /Gy /c /D UNICO= DE /Od /Oy- /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARN= INGS /D _CRT_SECURE_NO_DEPRECATE + MSFT:*_*_*_PP_FLAGS =3D=3D /nologo /E /TC /FIAutoGen.h =20 - MSFT:*_*_IA32_DLINK_FLAGS =3D /LIBPATH:"$(VCINSTALLDIR)\Lib" /L= IBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%UniversalCRTSdkDir%lib\= %UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%= \um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:RE= F /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib = Winmm.lib Advapi32.lib - MSFT:*_VS2015_IA32_DLINK_FLAGS =3D /LIBPATH:"$(VCINSTALLDIR)\Lib" /L= IBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%UniversalCRTSdkDir%lib\= %UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%= \um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:RE= F /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib = Winmm.lib Advapi32.lib vcruntimed.lib ucrtd.lib - MSFT:*_VS2015x86_IA32_DLINK_FLAGS =3D /LIBPATH:"$(VCINSTALLDIR)\Lib" /L= IBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /LIBPATH:"%UniversalCRTSdkDir%lib\= %UCRTVersion%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%= \um\x86" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:RE= F /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib = Winmm.lib Advapi32.lib vcruntimed.lib ucrtd.lib + MSFT:*_VS2015_IA32_DLINK_FLAGS =3D /LIBPATH:"%VS2015_PREFIX%Lib" /LI= BPATH:"%VS2015_PREFIX%VC\Lib" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersio= n%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86" /N= OLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /M= ACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib A= dvapi32.lib vcruntimed.lib ucrtd.lib + MSFT:*_VS2015x86_IA32_DLINK_FLAGS =3D /LIBPATH:"%VS2015_PREFIX%Lib" /LI= BPATH:"%VS2015_PREFIX%VC\Lib" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersio= n%\ucrt\x86" /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86" /N= OLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /M= ACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib A= dvapi32.lib vcruntimed.lib ucrtd.lib MSFT:*_VS2017_IA32_DLINK_FLAGS =3D /LIBPATH:"%VCToolsInstallDir%lib\= x86" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x86" /LIBPATH:"%W= indowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86" /NOLOGO /SUBSYSTEM:CONSOLE = /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel3= 2.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib A= dvapi32.lib MSFT:*_*_IA32_ASM_FLAGS =3D=3D /nologo /W3 /WX /c /coff /Cx /Z= d /W0 /Zi MSFT:*_*_IA32_ASMLINK_FLAGS =3D=3D /link /nologo /tiny =20 - MSFT:*_*_X64_DLINK_FLAGS =3D /LIBPATH:"$(VCINSTALLDIR)\Lib\AMD= 64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%Wi= ndowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE /= NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel3= 2.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib Advapi32.lib - MSFT:*_VS2015_X64_DLINK_FLAGS =3D /LIBPATH:"$(VCINSTALLDIR)\Lib\AMD= 64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%Wi= ndowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE /= NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel3= 2.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib A= dvapi32.lib - MSFT:*_VS2015x86_X64_DLINK_FLAGS =3D /LIBPATH:"$(VCINSTALLDIR)\Lib\AMD= 64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%Wi= ndowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE /= NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kernel3= 2.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib A= dvapi32.lib + MSFT:*_VS2015_X64_DLINK_FLAGS =3D /LIBPATH:"%VS2015_PREFIX%VC\Lib\A= MD64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%= WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE= /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kerne= l32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib= Advapi32.lib + MSFT:*_VS2015x86_X64_DLINK_FLAGS =3D /LIBPATH:"%VS2015_PREFIX%VC\Lib\A= MD64" /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x64" /LIBPATH:"%= WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x64" /NOLOGO /SUBSYSTEM:CONSOLE= /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:AMD64 /LTCG Kerne= l32.lib MSVCRTD.lib vcruntimed.lib ucrtd.lib Gdi32.lib User32.lib Winmm.lib= Advapi32.lib 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 - - INTEL:*_*_IA32_DLINK_FLAGS =3D /LIBPATH:"C:\Program Files\Intel\= Compiler\C++\9.1\IA32\Lib" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINS= TALLDIR)\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:= 4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi3= 2.lib User32.lib Winmm.lib - INTEL:*_*_IA32_ASM_FLAGS =3D=3D /nologo /W3 /WX /c /coff /Cx /Z= d /W0 /Zi - INTEL:*_*_IA32_ASMLINK_FLAGS =3D=3D /link /nologo /tiny --=20 2.21.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 (#44841): https://edk2.groups.io/g/devel/message/44841 Mute This Topic: https://groups.io/mt/32687216/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 Thu May 2 04:57:58 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+44842+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+44842+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564716196; cv=none; d=zoho.com; s=zohoarc; b=lN7gzu5iCjku1Kzd3zHIjuC+sqLfkAuFGI5wf29iITwOV/89cI1oXk629z+6rXniSrM1O/5zCIQxMz6ka6V1HDcWj/1GuR7jEG1MQAWloKN3cL1SqYYfhVdkPPS1ToWpUFBmbOelfNwuXsiPtDj0DrmGZH1o2zukLMyr/i73vf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564716196; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=MAIcDVkG58vEa4L9OSoUaPEEEboc6EPfmdQ5cyY3abE=; b=TSzEt2NK1ALGU+JdHGX2NMKM/tg5oCWoCG5MnmSUj9pCmljfPQT0OufkC2tynfj+bB678OJd3CXSCJbc3FYKeyjz5p/sTqYotS5OVN1s4D21p08ijtocpWXsFfyFr89RW1MEsYMrxHru8BvU3sZonAexFLQzeihBvuEjs76apIA= 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+44842+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 156471619689862.097169671839765; Thu, 1 Aug 2019 20:23:16 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Thu, 01 Aug 2019 20:23:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2019 20:23:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,336,1559545200"; d="scan'208";a="256855691" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.251.130.221]) by orsmga001.jf.intel.com with ESMTP; 01 Aug 2019 20:23:15 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jordan Justen , Andrew Fish Subject: [edk2-devel] [Patch 2/4] EmulatorPkg/Unix/Host: Fix NetworkPkg dependencies Date: Thu, 1 Aug 2019 20:23:07 -0700 Message-Id: <20190802032309.29000-3-michael.d.kinney@intel.com> In-Reply-To: <20190802032309.29000-1-michael.d.kinney@intel.com> References: <20190802032309.29000-1-michael.d.kinney@intel.com> MIME-Version: 1.0 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,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564716196; bh=3b4RpnlkslJ0KKm/NYvq923YxfLxCFNSgMEt4scFF9U=; h=Cc:Date:From:Reply-To:Subject:To; b=rFFMSfdiHiMMR6mg7ZrOY7rIohDqtidqRQ6+gEi6GzDCKFHatlrAGIJW7iRDeopmt1R pfnpwVJ3lB/hgAIqsm8wt4fzokE9Zf4NFM+pSarq707b9Q3At5n+t4/p2j/RqeOXUMJRH Kva+JWlS3v+RW3t0o3E5k+jCEG4vsOT1SuY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D2046 * Add NetworkPkg to UNIX Host.inf dependencies * Fix MacOS redefinition of NTOHLL and HTONLL macros between EDK II and standard includes in UNIX Host.h. Cc: Jordan Justen Cc: Andrew Fish CcM: Ray Ni Signed-off-by: Michael D Kinney Reviewed-by: Ray Ni --- EmulatorPkg/Unix/Host/Host.h | 6 +++++- EmulatorPkg/Unix/Host/Host.inf | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h index c26e979efa..9791cf8c37 100644 --- a/EmulatorPkg/Unix/Host/Host.h +++ b/EmulatorPkg/Unix/Host/Host.h @@ -1,6 +1,6 @@ /*++ @file =20 -Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -14,7 +14,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // Name mangle to prevent build errors. I.e conflicts between EFI and OS // #define NTOHL _UNIX_EFI_NAME_MANGLE_NTOHL_ +#define NTOHLL _UNIX_EFI_NAME_MANGLE_NTOHLL_ #define HTONL _UNIX_EFI_NAME_MANGLE_HTONL_ +#define HTONLL _UNIX_EFI_NAME_MANGLE_HTONLL_ #define NTOHS _UNIX_EFI_NAME_MANGLE_NTOHS_ #define HTONS _UNIX_EFI_NAME_MANGLE_HTOHS_ #define B0 _UNIX_EFI_NAME_MANGLE_B0_ @@ -72,7 +74,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include =20 #undef NTOHL +#undef NTOHLL #undef HTONL +#undef HTONLL #undef NTOHS #undef HTONS #undef B0 diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf index 71732d89fc..efe8a2b5e5 100644 --- a/EmulatorPkg/Unix/Host/Host.inf +++ b/EmulatorPkg/Unix/Host/Host.inf @@ -46,6 +46,7 @@ [Sources.IA32] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + NetworkPkg/NetworkPkg.dec EmulatorPkg/EmulatorPkg.dec =20 [LibraryClasses] --=20 2.21.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 (#44842): https://edk2.groups.io/g/devel/message/44842 Mute This Topic: https://groups.io/mt/32687217/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 Thu May 2 04:57:58 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+44843+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+44843+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564716197; cv=none; d=zoho.com; s=zohoarc; b=PZjR4Qvckek75hX0BZSM2eIDWpXMyugH/ahWikRKJ0O0IRtekC6VS0cwdA4XCQ0Nyw+mZ7SDNQujLI94yNmLfkqZ8qc0hx4wahvjTtBrYdK+0iN5jDRQTqmLPeyjON47ZroGtnWQfQ+OzpclylDYueMmisqYnVxjLw510eCTR0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564716197; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=4BFZwBjPuKKJPhkEsZpPJJiy0QDVcP+smITgbRU1uOc=; b=kKUZPBurAHe8kccbvrkipk7OmT4p4THwk//X6Jd2WC1waw00wI5/Uz5PfV/gYwicZIHAuFu/MMI1liUCWKK9iRkzUmH4xGm7lB9tkhEGim+1E7QTinxjKSl0Vnpdi3PU6xsjVAh+SVAh6x1DzoAZ7zyWVafrlEAHgZAlMNJsJ+g= 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+44843+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 1564716197298199.40458187981142; Thu, 1 Aug 2019 20:23:17 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Thu, 01 Aug 2019 20:23:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2019 20:23:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,336,1559545200"; d="scan'208";a="256855695" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.251.130.221]) by orsmga001.jf.intel.com with ESMTP; 01 Aug 2019 20:23:15 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jordan Justen , Andrew Fish , Ray Ni Subject: [edk2-devel] [Patch 3/4] EmulatorPkg/Unix/Host: Fix XCODE5 IA32/X64 build failure Date: Thu, 1 Aug 2019 20:23:08 -0700 Message-Id: <20190802032309.29000-4-michael.d.kinney@intel.com> In-Reply-To: <20190802032309.29000-1-michael.d.kinney@intel.com> References: <20190802032309.29000-1-michael.d.kinney@intel.com> MIME-Version: 1.0 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,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564716197; bh=6xJDh5QJBKHH5JB48uTZueR5YXM8bWUAyOVZpwEZCN0=; h=Cc:Date:From:Reply-To:Subject:To; b=HPNpzsC3sZsxekwqabN7taevF5e6SVjbDy/0UykuMIrILFMNux3jyADzbu8SqzJGQ5t KFtG2JtR/jKW/aRSgL2CA7XtZXZlAUnOUkthsdJsNNvX4/rMu5Nux9OvfH/rkImNBlGtw FncqCjaivDuLmgq03q80Sk3bUermOe37isM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D2046 * Clean up XCODE5 IA32 [BuildOptions] and fix IA32 X11 include path. * Add -DEFIAPI=3D__attribute__((ms_abi)) to X64 XCODE5 [BuildOptions] * Use -target x86_64-apple-darwin for X64 XCODE5 [BuildOptions] * Add Wl,-no_pie to X64 XCODE5 [BuildOptions] * Address function type mismatch reported by XCODE5 in reverse gasket callback between UEFI ABI and MacOS ABI. Use a UINTN to pass function address to assembly code. Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Signed-off-by: Michael D Kinney Reviewed-by: Ray Ni --- EmulatorPkg/Unix/Host/EmuThunk.c | 4 ++-- EmulatorPkg/Unix/Host/Gasket.h | 4 ++-- EmulatorPkg/Unix/Host/Host.inf | 8 ++++---- EmulatorPkg/Unix/Host/Pthreads.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c b/EmulatorPkg/Unix/Host/EmuTh= unk.c index 1c261a63cc..1e9dc99187 100644 --- a/EmulatorPkg/Unix/Host/EmuThunk.c +++ b/EmulatorPkg/Unix/Host/EmuThunk.c @@ -30,7 +30,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 int settimer_initialized; struct timeval settimer_timeval; -void (*settimer_callback)(UINT64 delta); +UINTN settimer_callback =3D 0; =20 BOOLEAN gEmulatorInterruptEnabled =3D FALSE; =20 @@ -194,7 +194,7 @@ SecSetTimer ( if (setitimer (ITIMER_REAL, &timerval, NULL) !=3D 0) { printf ("SetTimer: setitimer error %s\n", strerror (errno)); } - settimer_callback =3D CallBack; + settimer_callback =3D (UINTN)CallBack; } =20 =20 diff --git a/EmulatorPkg/Unix/Host/Gasket.h b/EmulatorPkg/Unix/Host/Gasket.h index e66f334960..e082397d23 100644 --- a/EmulatorPkg/Unix/Host/Gasket.h +++ b/EmulatorPkg/Unix/Host/Gasket.h @@ -1,7 +1,7 @@ /** @file =20 Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
- Copyright (c) 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -195,7 +195,7 @@ void =20 UINTN ReverseGasketUint64 ( - CALL_BACK CallBack, + UINTN CallBack, UINT64 a ); =20 diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf index efe8a2b5e5..ca4294249b 100644 --- a/EmulatorPkg/Unix/Host/Host.inf +++ b/EmulatorPkg/Unix/Host/Host.inf @@ -2,7 +2,7 @@ # Entry Point of Emu Emulator # # Main executable file of Unix Emulator that loads PEI core after initiali= zation finished. -# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.
# Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -132,11 +132,11 @@ [BuildOptions] # Need to do this link via gcc and not ld as the pathing to libraries chan= ges from OS version to OS version # XCODE:*_*_IA32_DLINK_PATH =3D=3D gcc - XCODE:*_*_IA32_CC_FLAGS =3D=3D -arch i386 -O0 -g -include $(DEST_DIR_DE= BUG)/AutoGen.h -c -fshort-wchar -fno-strict-aliasing + XCODE:*_*_IA32_CC_FLAGS =3D -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11Inc= ludeHack XCODE:*_*_IA32_DLINK_FLAGS =3D=3D -arch i386 -o $(BIN_DIR)/Host -L/usr/= X11R6/lib -lXext -lX11 -framework Carbon XCODE:*_*_IA32_ASM_FLAGS =3D=3D -arch i386 -g =20 XCODE:*_*_X64_DLINK_PATH =3D=3D gcc - XCODE:*_*_X64_DLINK_FLAGS =3D=3D -o $(BIN_DIR)/Host -L/usr/X11R6/lib -l= Xext -lX11 -framework Carbon + XCODE:*_*_X64_DLINK_FLAGS =3D=3D -L/usr/X11R6/lib -lXext -lX11 -framewo= rk Carbon -Wl,-no_pie XCODE:*_*_X64_ASM_FLAGS =3D=3D -g - XCODE:*_*_X64_CC_FLAGS =3D -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11Incl= udeHack + XCODE:*_*_X64_CC_FLAGS =3D -target x86_64-apple-darwin -I$(WORKSPACE)/E= mulatorPkg/Unix/Host/X11IncludeHack "-DEFIAPI=3D__attribute__((ms_abi))" diff --git a/EmulatorPkg/Unix/Host/Pthreads.c b/EmulatorPkg/Unix/Host/Pthre= ads.c index 7c71a2da4f..f07bcfce66 100644 --- a/EmulatorPkg/Unix/Host/Pthreads.c +++ b/EmulatorPkg/Unix/Host/Pthreads.c @@ -2,7 +2,7 @@ POSIX Pthreads to emulate APs and implement threads =20 Copyright (c) 2011, Apple Inc. All rights reserved. -Copyright (c) 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -109,7 +109,7 @@ SecFakePthreadStart ( // This is a great example of how all problems in computer // science can be solved by adding another level of indirection // - return (VOID *)ReverseGasketUint64 ((CALL_BACK)Start, (UINTN)Context); + return (VOID *)ReverseGasketUint64 ((UINTN)Start, (UINTN)Context); } =20 UINTN --=20 2.21.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 (#44843): https://edk2.groups.io/g/devel/message/44843 Mute This Topic: https://groups.io/mt/32687218/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 Thu May 2 04:57:58 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+44844+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+44844+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564716199; cv=none; d=zoho.com; s=zohoarc; b=KQw2WKHOpLZvXdaNIoZ8yPfUrLudNTCthwXLHrs+uFQvZXk/YYpirG2DDKh5NjByOmKDl7bUcXjhcq7BQjol6OS+GCyHsEGv+f9UWc8KqSTW5zPmNm+didOTPvmHq7f9G4mB8KOAAzE7xaQAm/sW9e+W0g2V+2fUDZUU79nztUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564716199; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=QBhDVtz+gJZsM/SvBYt7y8TohYGTalgxIITQUl8NeQY=; b=Qa7McbW+8Qr+Zmh0HgbNYyP+jNJnN17veXIYEzG/yjigIQ/x10xRw/my/WJ+4GDIFBYSz/E+VkUoKEt67nO6nHpNq3DePQ/eTaxf6mR/KQoLv6XSjZuXjKHNE/uo8W9TLeGTz8XEdwu5QjUGGEkL0Gfz4RLycP31ooRSFuCl9EE= 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+44844+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 1564716199128608.060524035349; Thu, 1 Aug 2019 20:23:19 -0700 (PDT) Return-Path: X-Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Thu, 01 Aug 2019 20:23:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2019 20:23:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,336,1559545200"; d="scan'208";a="256855702" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.251.130.221]) by orsmga001.jf.intel.com with ESMTP; 01 Aug 2019 20:23:16 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Jordan Justen , Andrew Fish , Ray Ni Subject: [edk2-devel] [Patch 4/4] MdePkg/X64/ProcessorBind.h: Fix EmulatorPkg X64 XCODE5 Date: Thu, 1 Aug 2019 20:23:09 -0700 Message-Id: <20190802032309.29000-5-michael.d.kinney@intel.com> In-Reply-To: <20190802032309.29000-1-michael.d.kinney@intel.com> References: <20190802032309.29000-1-michael.d.kinney@intel.com> MIME-Version: 1.0 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,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564716198; bh=ruyTqIVUJbKu8EQb6XXiN/y5HQ6t1uCZbRsJeGHqJr4=; h=Cc:Date:From:Reply-To:Subject:To; b=tSS9rsbfX5N2X1Y+zJRejEbaHfVSTb363wxu41PItmILuZWi60ZZgJ1zdG3wB6yUXb+ SgBx9xrVzNnQLAjmoJELbTh+1ra9amNFPWeBTIdb2/tFpRPtuOhqM9JUGm2AjmCR45EUP UKtAkB7vSa2WiOEd3COQxDrtNy/Tk5yPMUw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D2046 Make sure all libs that should be dynamically linked are dynamically linked when XCODE5 compiler is used. A previous change introduced the following pragma: #pragma GCC visibility push (hidden) When the EmulatorPkg is built using XCODE5 toolchain for X64, this pragma is included and it generates a linker error when building the Unix Host module. This change uses !defined(__APPLE__) to prevent the use of this pragma when building EmulatorPkg/Unix/Host. Cc: Liming Gao Cc: Jordan Justen Cc: Andrew Fish Cc: Ray Ni Signed-off-by: Michael D Kinney Reviewed-by: Liming Gao Reviewed-by: Ray Ni --- MdePkg/Include/X64/ProcessorBind.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/Proces= sorBind.h index b22cb226b0..6f65acd609 100644 --- a/MdePkg/Include/X64/ProcessorBind.h +++ b/MdePkg/Include/X64/ProcessorBind.h @@ -1,7 +1,7 @@ /** @file Processor or Compiler specific defines and types x64 (Intel 64, AMD64). =20 - Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -21,7 +21,7 @@ #pragma pack() #endif =20 -#if defined(__GNUC__) && defined(__pic__) && !defined(USING_LTO) +#if defined(__GNUC__) && defined(__pic__) && !defined(USING_LTO) && !defi= ned(__APPLE__) // // Mark all symbol declarations and references as hidden, meaning they will // not be subject to symbol preemption. This allows the compiler to refer = to --=20 2.21.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 (#44844): https://edk2.groups.io/g/devel/message/44844 Mute This Topic: https://groups.io/mt/32687219/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-