Skip to content

Commit

Permalink
CryptoBinPkg: Use OpenSSL intrinsic lib for all archs
Browse files Browse the repository at this point in the history
ArmCompilerIntrinsicsLib was previously used for ARM and AARCH64
code. With strcmp moving to CrtWrapper.c, the code can pick it up
from there and use the OpensslPkg intrinisc lib instance.

Signed-off-by: Michael Kubacki <[email protected]>
  • Loading branch information
makubacki committed Aug 9, 2024
1 parent 1968c9b commit 0bfff24
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
7 changes: 1 addition & 6 deletions CryptoBinPkg/CryptoBinPkg.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
FltUsedLib|MdePkg/Library/FltUsedLib/FltUsedLib.inf
HashApiLib|CryptoPkg/Library/BaseHashApiLib/BaseHashApiLib.inf
HmacSha1Lib|OpensslPkg/Library/HmacSha1Lib/HmacSha1Lib.inf
IntrinsicLib|OpensslPkg/Library/IntrinsicLib/IntrinsicLib.inf
IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf
Expand All @@ -72,8 +73,6 @@
UnitTestResultReportLib|UnitTestFrameworkPkg/Library/UnitTestResultReportLib/UnitTestResultReportLibDebugLib.inf
NULL|MdePkg/Library/FltUsedLib/FltUsedLib.inf

[LibraryClasses.IA32, LibraryClasses.X64]
IntrinsicLib|OpensslPkg/Library/IntrinsicLib/IntrinsicLib.inf

#
# For stack protection
Expand All @@ -99,10 +98,6 @@
BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
!endif

[LibraryClasses.ARM, LibraryClasses.AARCH64]
IntrinsicLib|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf
NULL|MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf

[LibraryClasses.common.PEIM]
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
Expand Down
2 changes: 1 addition & 1 deletion MU_BASECORE
Submodule MU_BASECORE updated 113 files

0 comments on commit 0bfff24

Please sign in to comment.