Leif: There is one mistake in comments >+ #^M. Could you clean it? With this change, Reviewed-by: Liming Gao <liming....@intel.com>.
Besides, have you verified AARCH64 GCC build? Thanks Liming >-----Original Message----- >From: Leif Lindholm [mailto:leif.lindh...@linaro.org] >Sent: Thursday, November 01, 2018 11:37 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming <liming....@intel.com> >Subject: [PATCH 2/6] 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 <liming....@intel.com> >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Leif Lindholm <leif.lindh...@linaro.org> >--- > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 13 >++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > >diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc >b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc >index 894c5340a0..14bef5356e 100644 >--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc >+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc >@@ -25,7 +25,7 @@ [Defines] > 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 @@ [LibraryClasses] > 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. >+ #^M >+ 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 >-- >2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
