From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web09.4624.1612324481531614725 for ; Tue, 02 Feb 2021 19:54:41 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=J0BpStSV; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (unknown [131.107.174.202]) by linux.microsoft.com (Postfix) with ESMTPSA id 26D4420B7192; Tue, 2 Feb 2021 19:54:41 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 26D4420B7192 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1612324481; bh=nJSrRukUmVrdqcI0O/D3SJrwAYbOKvuSFIAUUliEGHg=; h=From:To:Cc:Subject:Date:From; b=J0BpStSVlKjNAPOb+O7tOlX1UUWA2tWKpcfawr2Zdnq8aMLBYriP0TCEMVJWPKIeF 0WEe9tKXDCE5N/OICYG8WfJXw9JOR82l2MudukjnOA4VdJ7kdm5GZUCkGOIcErQD3J Gd2VJXfCdx4YsG5w6dpesg2LZvb5F6O8f2xxM2LQ= From: mikuback@linux.microsoft.com To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh Subject: [PATCH v1 1/1] StandaloneMmPkg: Add X64 build support Date: Tue, 2 Feb 2021 19:54:15 -0800 Message-Id: <20210203035415.514-1-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Kubacki REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3202 Several libraries have been added to the package to support X64 but the package itself does not support X64. This modifies the DSC to enable X64 build. Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Signed-off-by: Michael Kubacki --- StandaloneMmPkg/StandaloneMmPkg.dsc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standa= loneMmPkg.dsc index a566724c88ab..73f3f0f6b1cd 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc @@ -3,6 +3,7 @@ # # Copyright (c) 2015, Intel Corporation. All rights reserved.
# Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.
+# Copyright (C) Microsoft Corporation
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -19,7 +20,7 @@ [Defines] PLATFORM_VERSION =3D 1.0 DSC_SPECIFICATION =3D 0x00010011 OUTPUT_DIRECTORY =3D Build/StandaloneMm - SUPPORTED_ARCHITECTURES =3D AARCH64 + SUPPORTED_ARCHITECTURES =3D AARCH64|X64 BUILD_TARGETS =3D DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT =20 @@ -37,6 +38,7 @@ [LibraryClasses] # BaseLib|MdePkg/Library/BaseLib/BaseLib.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf + CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMa= intenanceLib.inf DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/Bas= eDebugPrintErrorLevelLib.inf ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionL= ib/PrePiExtractGuidedSectionLib.inf @@ -47,7 +49,7 @@ [LibraryClasses] MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllo= cationLib/StandaloneMmCoreMemoryAllocationLib.inf MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/Standal= oneMmServicesTableLib.inf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraAc= tionLib/StandaloneMmPeCoffExtraActionLib.inf + PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BaseP= eCoffExtraActionLibNull.inf PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRep= ortStatusCodeLibNull.inf @@ -60,6 +62,7 @@ [LibraryClasses.AARCH64] StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneM= mLib.inf ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMain= tenanceLib.inf + PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraAc= tionLib/StandaloneMmPeCoffExtraActionLib.inf =20 NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf @@ -110,11 +113,11 @@ [Components.common] StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMe= moryAllocationLib.inf - StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmP= eCoffExtraActionLib.inf StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf =20 [Components.AARCH64] StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf + StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmP= eCoffExtraActionLib.inf =20 ########################################################################= ########################### # @@ -128,3 +131,7 @@ [Components.AARCH64] [BuildOptions.AARCH64] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 -march=3Darmv8-a+= nofp -mstrict-align GCC:*_*_*_CC_FLAGS =3D -mstrict-align + +[BuildOptions.X64] + MSFT:*_*_*_DLINK_FLAGS =3D /ALIGN:4096 + GCC:*_GCC*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 --=20 2.28.0.windows.1