CryptoPkg: Fix build problem with XCODE

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1089

When building CryptoPkg with XCODE, blow error may result

* usr/lib/clang/9.0.0/include/stdatomic.h:105:17:
error: unknown type name 'wchar_t'

Since the C native atomics are C11 feature we can explicitly
use C99 to work around it.
add -std=c99 to avoid it

* openssl/crypto/conf/conf_sap.c:71:12: error: variable 'ret' is
    uninitialized
    when used here [-Werror,-Wuninitialized]

Suppress warnings in OpenSSL so we don't break the build with -Werror.
add -Wno-error=uninitialized to disalbe this warning

Cc: Jian Wang <jian.j.wang@intel.com>
Cc: Ting Ye <ting.ye@intel.com>
Signed-off-by: Xiaoyu Lu <xiaoyux.lu@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
index 4a76e7e65377e3034741fe9f173e9f30e48c440f..26ce11d0c2e4d395d319cede9b7783a9bd5b4b8a 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -99,3 +99,5 @@
 \r
   GCC:*_CLANG35_*_CC_FLAGS = -std=c99\r
   GCC:*_CLANG38_*_CC_FLAGS = -std=c99\r
+\r
+  XCODE:*_*_*_CC_FLAGS = -std=c99\r

diff --git a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
index 7827ff87553db714f08a5f054c8e9e422c499e1e..8b5278a0c1d52a3903034886de15bf90124254b5 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
@@ -96,3 +96,5 @@
 \r
   GCC:*_CLANG35_*_CC_FLAGS = -std=c99\r
   GCC:*_CLANG38_*_CC_FLAGS = -std=c99\r
+\r
+  XCODE:*_*_*_CC_FLAGS = -std=c99\r

diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
index c222bcaf2b69af7dd93f42ad2f556fef6fadc272..bc08f9d2ccd65bc4305e8112ed44ab217457b0d2 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
@@ -104,3 +104,5 @@
 \r
   GCC:*_CLANG35_*_CC_FLAGS = -std=c99\r
   GCC:*_CLANG38_*_CC_FLAGS = -std=c99\r
+\r
+  XCODE:*_*_*_CC_FLAGS = -std=c99\r

diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
index 987a6c743f2b61b4cacc0487fb986c42a80d4aaa..d74ca3e2e41d12153148ef95c51eef58cac824d8 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
+++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
@@ -97,7 +97,7 @@
   #\r
   MSFT:*_*_*_CC_FLAGS = /wd4090\r
 \r
-  XCODE:*_*_*_CC_FLAGS = -mmmx -msse\r
+  XCODE:*_*_*_CC_FLAGS = -mmmx -msse -std=c99\r
 \r
   GCC:*_CLANG35_*_CC_FLAGS = -std=c99\r
   GCC:*_CLANG38_*_CC_FLAGS = -std=c99\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index ac7f6f6ca7df61d8d25b4ab31ade55e9968fd01d..378fa6588eecc2eac1a290277de46922b95bcf46 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -624,8 +624,8 @@
   # 3017: <entity> may be used before being set (NOTE: This was fixed in OpenSSL 1.1 HEAD with\r
   #       commit d9b8b89bec4480de3a10bdaf9425db371c19145b, and can be dropped then.)\r
   RVCT:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) --library_interface=aeabi_clib99 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188,128,546,1,3017 -JCryptoPkg/Include\r
-  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
-  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
+  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized\r
+  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized\r
 \r
   #\r
   # AARCH64 uses strict alignment and avoids SIMD registers for code that may execute\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 6fd31cbb376772918d727fa2c5b4d6bee88665f8..24d3d96459490702c45d6e9c5cbd4f31db5218b7 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -580,8 +580,8 @@
   # 3017: <entity> may be used before being set (NOTE: This was fixed in OpenSSL 1.1 HEAD with\r
   #       commit d9b8b89bec4480de3a10bdaf9425db371c19145b, and can be dropped then.)\r
   RVCT:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) --library_interface=aeabi_clib99 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188,128,546,1,3017 -JCryptoPkg/Include\r
-  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
-  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
+  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized\r
+  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized\r
 \r
   #\r
   # AARCH64 uses strict alignment and avoids SIMD registers for code that may execute\r