summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzwei4 <david.wei@intel.com>2017-05-14 16:02:10 +0800
committerzwei4 <david.wei@intel.com>2017-05-14 16:02:10 +0800
commitb85bc33fdc99b645696d2f3a021c9e6cce65d410 (patch)
tree55efeeb0cbf824efc4ab18424cb2a73ce1d2fca8
parent95a96d2f14376c3ed3e7913173b8777408f1269e (diff)
downloadedk2-platforms-b85bc33fdc99b645696d2f3a021c9e6cce65d410.tar.xz
Fix GCC build errors.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: zwei4 <david.wei@intel.com>
-rw-r--r--Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei/PlatformInitPreMem.c5
-rw-r--r--Platform/BroxtonPlatformPkg/PlatformDsc/BuildOptions.EDKII.Gcc.dsc1
-rw-r--r--Silicon/BroxtonSoC/BroxtonSiPkg/SouthCluster/ScSmiDispatcher/Smm/ScSmiDispatcher.inf2
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 d7ef4970b8..fe454bf89f 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 7c7f9c2b17..1d5786d596 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 9ba40ca088..09b36eb332 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