From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B59E021A0482F for ; Fri, 31 Mar 2017 22:40:32 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP; 31 Mar 2017 22:40:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,256,1486454400"; d="scan'208";a="67679631" Received: from shwde6388.ccr.corp.intel.com ([10.239.9.17]) by orsmga002.jf.intel.com with ESMTP; 31 Mar 2017 22:40:26 -0700 From: Long Qin To: edk2-devel@lists.01.org Cc: ting.ye@intel.com, hao.a.wu@intel.com, feng.tian@intel.com, eric.dong@intel.com, lersek@redhat.com, Qin Long Date: Sat, 1 Apr 2017 13:38:32 +0800 Message-Id: <20170401053834.12856-3-qin.long@intel.com> X-Mailer: git-send-email 2.12.2.windows.1 In-Reply-To: <20170401053834.12856-1-qin.long@intel.com> References: <20170401053834.12856-1-qin.long@intel.com> Subject: [PATCH v2 2/4] CryptoPkg: Fix possible unresolved external symbol issue. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Apr 2017 05:40:32 -0000 From: Qin Long 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 Cc: Feng Tian Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qin Long --- CryptoPkg/Include/CrtLibSupport.h | 1 + CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CryptoPkg/Include/CrtLibSupport.h b/CryptoPkg/Include/CrtLibSupport.h index ddf7784a37..7f1ec12302 100644 --- a/CryptoPkg/Include/CrtLibSupport.h +++ b/CryptoPkg/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 #include +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); -- 2.12.2.windows.1