diff options
author | Qin Long <qin.long@intel.com> | 2017-04-01 11:30:55 +0800 |
---|---|---|
committer | Qin Long <qin.long@intel.com> | 2017-04-07 00:27:34 +0800 |
commit | 5d7a1d63c0fa53d411a06c6f03de939c1cc26da2 (patch) | |
tree | 15eda880fc181e7466a602a37cd0bc3a5b16bd5b | |
parent | 81bec7aa5216dac2013c95d58559ebd414b84bce (diff) | |
download | edk2-platforms-5d7a1d63c0fa53d411a06c6f03de939c1cc26da2.tar.xz |
CryptoPkg: Fix possible unresolved external symbol issue.
The compiler (visual studio) may optimize some explicit strcmp call
in openssl source to use the intrinsic memcmp call.
In CrtLibSupport.h, we just use #define to mapping memcmp to
CompareMem API. So in Link phase, this kind of intrinsic optimization
will cause the "unresolved external symbol" error. For example:
OpensslLib.lib(v3_utl.obj) : error LNK2001:
unresolved external symbol _memcmp
This patch will keep the memcmp mapping, and provide extra Intrinsic
memcmp wrapper to satisfy the symbol link.
Cc: Ting Ye <ting.ye@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qin Long <qin.long@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
-rw-r--r-- | CryptoPkg/Library/Include/CrtLibSupport.h | 1 | ||||
-rw-r--r-- | CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h index ddf7784a37..7f1ec12302 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -133,6 +133,7 @@ void *malloc (size_t); void *realloc (void *, size_t);
void free (void *);
void *memset (void *, int, size_t);
+int memcmp (const void *, const void *, size_t);
int isdigit (int);
int isspace (int);
int isxdigit (int);
diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c index e8a76d07ff..bf485d680d 100644 --- a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c +++ b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c @@ -17,12 +17,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Library/BaseMemoryLib.h>
#include <Library/BaseLib.h>
+typedef UINTN size_t;
+
/* OpenSSL will use floating point support, and C compiler produces the _fltused
symbol by default. Simply define this symbol here to satisfy the linker. */
int _fltused = 1;
/* Sets buffers to a specified character */
-void * memset (void *dest, char ch, unsigned int count)
+void * memset (void *dest, char ch, size_t count)
{
//
// NOTE: Here we use one base implementation for memset, instead of the direct
@@ -46,6 +48,12 @@ void * memset (void *dest, char ch, unsigned int count) return dest;
}
+/* Compare bytes in two buffers. */
+int memcmp (const void *buf1, const void *buf2, size_t count)
+{
+ return (int)CompareMem(buf1, buf2, count);
+}
+
int strcmp (const char *s1, const char *s2)
{
return (int)AsciiStrCmp(s1, s2);
|