On Wed, 3 Feb 2021 at 04:54, <mikub...@linux.microsoft.com> wrote: > > From: Michael Kubacki <michael.kuba...@microsoft.com> > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3202 > > 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 <ard.biesheu...@arm.com> > Cc: Sami Mujawar <sami.muja...@arm.com> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Supreeth Venkatesh <supreeth.venkat...@arm.com> > Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com> > --- > StandaloneMmPkg/StandaloneMmPkg.dsc | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc > b/StandaloneMmPkg/StandaloneMmPkg.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.<BR> > # Copyright (c) 2016 - 2021, Arm Limited. All rights reserved.<BR> > +# Copyright (C) Microsoft Corporation<BR> > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > @@ -19,7 +20,7 @@ [Defines] > PLATFORM_VERSION = 1.0 > DSC_SPECIFICATION = 0x00010011 > OUTPUT_DIRECTORY = Build/StandaloneMm > - SUPPORTED_ARCHITECTURES = AARCH64 > + SUPPORTED_ARCHITECTURES = AARCH64|X64 > BUILD_TARGETS = DEBUG|RELEASE > SKUID_IDENTIFIER = DEFAULT > > @@ -37,6 +38,7 @@ [LibraryClasses] > # > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf > + > CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > > DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf > > ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf > @@ -47,7 +49,7 @@ [LibraryClasses] > > MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMmCoreMemoryAllocationLib.inf > > MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLib.inf > PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > - > PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf > + > PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf > PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > > ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf > @@ -60,6 +62,7 @@ [LibraryClasses.AARCH64] > > StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf > ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf > > CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf > + > PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf > > 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/StandaloneMmMemoryAllocationLib.inf > - > StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf > StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf > > [Components.AARCH64] > StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf > + > StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf > > > ################################################################################################### > # > @@ -128,3 +131,7 @@ [Components.AARCH64] > [BuildOptions.AARCH64] > GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv8-a+nofp > -mstrict-align > GCC:*_*_*_CC_FLAGS = -mstrict-align > + > +[BuildOptions.X64] > + MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096 > + GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000 > -- > 2.28.0.windows.1 > >
This one does not apply either. Perhaps it got mangled because I only received it via the mailing list rather than directly via CC? -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#71588): https://edk2.groups.io/g/devel/message/71588 Mute This Topic: https://groups.io/mt/80346423/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
