From dd178f0f93911f46af514de8b326d39d6e36400c Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 1 Nov 2018 14:58:22 +0000 Subject: IntelFrameworkModulePkg: fix build for AARCH64/ARM Contrary to what the name suggests, some modules in this package are used on other architecture. ARM is already listed in SUPPORTED_ARCHITECTURES in the .dsc, but AARCH64 was never added. Add that, and force inclusion of CompilerIntrinsicsLib and BaseStackCheckLib for AARCH64/ARM to make the build successful. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm Reviewed-by: Liming Gao --- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'IntelFrameworkModulePkg') diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index 894c5340a0..949a181a7b 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -25,7 +25,7 @@ PLATFORM_VERSION = 0.96 DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/IntelFrameworkModuleAll - SUPPORTED_ARCHITECTURES = IA32|X64|EBC|ARM + SUPPORTED_ARCHITECTURES = IA32|X64|EBC|ARM|AARCH64 BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT @@ -76,6 +76,17 @@ UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf +[LibraryClasses.ARM, LibraryClasses.AARCH64] + # + # 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.PEIM] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf -- cgit