[edk2] Patches needed to compile CryptoPkg and SecurityPkg with Xcode.

Subject: [edk2] Patches needed to compile CryptoPkg and SecurityPkg with Xcode.

From: Andrew Fish <afish@apple.com>

To: edk2-devel@lists.sourceforge.net

Date: 2014-06-12 16:37:57


Contributed-under: TianoCore Contribution Agreement 1.0

>git diff CryptoPkg/
diff --git a/edk2/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/edk2/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
index cdbe3ac..ab517a4 100755
--- a/edk2/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
+++ b/edk2/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
@@ -108,4 +108,5 @@
 #
 [BuildOptions]
   GCC:*_GCC44_IA32_CC_FLAGS = "-D__cdecl=__attribute__((cdecl))" "-D__declspec(t)=__attribute__((t))"
+  XCODE:*_*_*_CC_FLAGS = -mmmx -msse

   

diff --git a/edk2/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/edk2/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index e8bec20..5a2d6a5 100755
--- a/edk2/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/edk2/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -609,3 +609,5 @@
    RVCT:*_*_IA32_CC_FLAGS                 = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3 -DTHIRTY_TWO_BIT
    RVCT:*_*_X64_CC_FLAGS                  = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3 -DSIXTY_FOUR_BIT
    RVCT:*_*_IPF_CC_FLAGS                  = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3 -DSIXTY_FOUR_BIT
+   XCODE:*_*_IA32_CC_FLAGS                  = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT
+   XCODE:*_*_X64_CC_FLAGS                   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT



>git diff SecurityPkg/
diff --git a/edk2/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c b/edk2/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
index 3cbd098..1729051 100644
--- a/edk2/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
+++ b/edk2/SecurityPkg/Library/DxeDeferImageLoadLib/DxeDeferImageLoadLib.c
@@ -246,7 +246,7 @@ GetAccessControl (
     CheckLen  = 0;
     while (CheckLen < Info->InfoSize - sizeof (EFI_USER_INFO)) {
       Access = (EFI_USER_INFO_ACCESS_CONTROL *) ((UINT8 *) (Info + 1) + CheckLen);
-      if ((Access->Type == AccessType)) {
+      if (Access->Type == AccessType) {
         *AccessControl = AllocateZeroPool (Access->Size);
         ASSERT (*AccessControl != NULL);
         CopyMem (*AccessControl, Access, Access->Size);
diff --git a/edk2/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf b/edk2/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
index 0ea5949..553dbf5 100644
--- a/edk2/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
+++ b/edk2/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
@@ -75,3 +75,6 @@

 

 [Depex]
   TRUE
+
+[BuildOptions]
+  XCODE:*_*_*_CC_FLAGS = -mmmx -msse