diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-12-29 03:17:46 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-12-29 03:17:46 +0000 |
| commit | bcd093fbbe55fca2f0814ca343c5e7112ef650e1 (patch) | |
| tree | 7db5389a79a57656ce3f43b2e558498543d2cfb0 /CryptoPkg/Library | |
| parent | ce302ad5bf3bd9ac52cf624b95747f9d8e6217cd (diff) | |
| download | edk2-bcd093fbbe55fca2f0814ca343c5e7112ef650e1.tar.gz edk2-bcd093fbbe55fca2f0814ca343c5e7112ef650e1.tar.bz2 edk2-bcd093fbbe55fca2f0814ca343c5e7112ef650e1.zip | |
CryptoPkg/OpensslLib: add softfloat dependency for ARM
UEFI on 32-bit ARM does not allow the use of hardware floating point,
so in order to be able to run OpenSslLib, we need to fulfil its
floating point arithmetic dependencies using a software library.
(Sync patch r19033 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Qin Long <qin.long@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19567 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'CryptoPkg/Library')
| -rw-r--r-- | CryptoPkg/Library/OpensslLib/OpensslLib.inf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index c8408921b9..a6d511e839 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -850,6 +850,9 @@ [LibraryClasses]
DebugLib
+[LibraryClasses.ARM]
+ ArmSoftFloatLib
+
[BuildOptions]
#
# Disables the following Visual Studio compiler warnings brought by openssl source, so we do not break the build with /WX option:
@@ -890,6 +893,6 @@ # 513: a value of type <type> cannot be assigned to an entity of type <type>
# 188: enumerated type mixed with another type (i.e. passing an integer as an enum without a cast)
# 1296: Extended constant initialiser used
- RVCT:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188
+ RVCT:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) --library_interface=aeabi_clib99 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188
XCODE:*_*_IA32_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
XCODE:*_*_X64_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
|