Fix GCC build errors.

[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Fix GCC build errors.

zwei4 posted 1 patch 7 years, 7 months ago

Download mbox

Failed in applying to current master (apply log)

.../Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c   | 5 +++++
Platform/BroxtonPlatformPkg/PlatformDsc/BuildOptions.EDKII.Gcc.dsc   | 1 -
.../SouthCluster/ScSmiDispatcher/Smm/ScSmiDispatcher.inf             | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)

Expand all Fold all

[edk2] [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017] Fix GCC build errors.

Posted by zwei4 7 years, 7 months ago

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>
---
 .../Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c   | 5 +++++
 Platform/BroxtonPlatformPkg/PlatformDsc/BuildOptions.EDKII.Gcc.dsc   | 1 -
 .../SouthCluster/ScSmiDispatcher/Smm/ScSmiDispatcher.inf             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
index d7ef4970b..fe454bf89 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c
@@ -217,6 +217,10 @@ CopyMemSse4 (
   IN UINTN SizeInBytes
   )
 {
+
+  #ifdef __GNUC__
+  CopyMem (Dst, Src, SizeInBytes); 
+  #else
   _asm {
     //
     // Initialize pointers to start of the USWC memory
@@ -281,6 +285,7 @@ CopyMemSse4 (
     movdqu  xmm3, [esp + 48]
     add     esp, 040h // stack cleanup
   }
+  #endif
   // End of Bulk Load loop
 }
 
diff --git a/Platform/BroxtonPlatformPkg/PlatformDsc/BuildOptions.EDKII.Gcc.dsc b/Platform/BroxtonPlatformPkg/PlatformDsc/BuildOptions.EDKII.Gcc.dsc
index 7c7f9c2b1..1d5786d59 100644
--- a/Platform/BroxtonPlatformPkg/PlatformDsc/BuildOptions.EDKII.Gcc.dsc
+++ b/Platform/BroxtonPlatformPkg/PlatformDsc/BuildOptions.EDKII.Gcc.dsc
@@ -104,5 +104,4 @@ DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIO
   *_*_X64_ASLPP_FLAGS    = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
   *_*_*_ASL_FLAGS        = $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS) -we
 
-  RELEASE_*_*_CC_FLAGS = /Zi
 
diff --git a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmiDispatcher.inf b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmiDispatcher.inf
index 9ba40ca08..09b36eb33 100644
--- a/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmiDispatcher.inf
+++ b/Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmiDispatcher.inf
@@ -82,4 +82,4 @@
   gEfiPciRootBridgeIoProtocolGuid
 
 [BuildOptions]
-  *_*_X64_CC_FLAGS  = -D X64_BUILD_SUPPORT = 1
+  *_*_X64_CC_FLAGS  = -D X64_BUILD_SUPPORT=1
-- 
2.11.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel