| Message ID | 20181101153642.11315-7-leif.lindholm@linaro.org |
|---|---|
| State | Accepted |
| Commit | 3b6c73f13eac3dc8bf7deb95237cd3f6abf40ce3 |
| Headers | show |
| Series | fix top-level package builds for AARCH64/ARM | expand |
Reviewed-by: jiewen.yao@intel.com thank you! Yao, Jiewen > 在 2018年11月1日，下午11:37，Leif Lindholm <leif.lindholm@linaro.org> 写道： > > This package is used by several platforms in edk2-platforms, so ensure it > can be built directly by adding AARCH64/ARM to SUPPORTED_ARCHITECTURES. > > Also force-include CompilerIntrinsicsLib, BaseStackCheckLib and create a > resolution for ArmSoftFloatLib for ARM. > > Cc: Jiewen Yao <jiewen.yao@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > SignedCapsulePkg/SignedCapsulePkg.dsc | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/SignedCapsulePkg.dsc > index db7f176166..3d9c4afb91 100644 > --- a/SignedCapsulePkg/SignedCapsulePkg.dsc > +++ b/SignedCapsulePkg/SignedCapsulePkg.dsc > @@ -19,7 +19,7 @@ [Defines] > PLATFORM_VERSION = 0.96 > DSC_SPECIFICATION = 0x00010005 > OUTPUT_DIRECTORY = Build/SignedCapsulePkg > - SUPPORTED_ARCHITECTURES = IA32|X64 > + SUPPORTED_ARCHITECTURES = AARCH64|ARM|IA32|X64 > BUILD_TARGETS = DEBUG|RELEASE|NOOPT > SKUID_IDENTIFIER = DEFAULT > > @@ -105,6 +105,19 @@ [LibraryClasses] > IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf > PlatformFlashAccessLib|SignedCapsulePkg/Library/PlatformFlashAccessLibNull/PlatformFlashAccessLibNull.inf > > +[LibraryClasses.ARM] > + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf > + > + # > + # It is not possible to prevent the ARM compiler for generic intrinsic functions. > + # This library provides the instrinsic functions generate by a given compiler. > + # And NULL mean link this library into all ARM images. > + # > + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + > + # Add support for GCC stack protector > + NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf > + > [LibraryClasses.common.PEI_CORE] > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf > -- > 2.11.0 >
diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/SignedCapsulePkg.dsc index db7f176166..3d9c4afb91 100644 --- a/SignedCapsulePkg/SignedCapsulePkg.dsc +++ b/SignedCapsulePkg/SignedCapsulePkg.dsc @@ -19,7 +19,7 @@ [Defines] PLATFORM_VERSION = 0.96 DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/SignedCapsulePkg - SUPPORTED_ARCHITECTURES = IA32|X64 + SUPPORTED_ARCHITECTURES = AARCH64|ARM|IA32|X64 BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT @@ -105,6 +105,19 @@ [LibraryClasses] IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf PlatformFlashAccessLib|SignedCapsulePkg/Library/PlatformFlashAccessLibNull/PlatformFlashAccessLibNull.inf +[LibraryClasses.ARM] + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf + + # + # It is not possible to prevent the ARM compiler for generic intrinsic functions. + # This library provides the instrinsic functions generate by a given compiler. + # And NULL mean link this library into all ARM images. + # + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + + # Add support for GCC stack protector + NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf + [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
This package is used by several platforms in edk2-platforms, so ensure it can be built directly by adding AARCH64/ARM to SUPPORTED_ARCHITECTURES. Also force-include CompilerIntrinsicsLib, BaseStackCheckLib and create a resolution for ArmSoftFloatLib for ARM. Cc: Jiewen Yao <jiewen.yao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> --- SignedCapsulePkg/SignedCapsulePkg.dsc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel