From 808bfde224c53624eb95c339c939e1b9a0582a0d Mon Sep 17 00:00:00 2001
From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 24 Jan 2008 09:35:36 +0000
Subject: [PATCH] Update memcpy.c and memset.c to support both /Ox and /Os of
 MSFT IPF toolchain. Without this change, MSFT /Ox will report "can't define
 intrinsic" error.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4630 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Foundation/Library/CompilerStub/memcpy.c         | 12 ++++++++++++
 .../Foundation/Library/CompilerStub/memset.c         | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
index 300724a132..69c45e1583 100644
--- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
+++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
@@ -28,6 +28,17 @@ Abstract:
 #include "Tiano.h"
 
 VOID *
+memcpy (
+  OUT VOID        *Dest,
+  IN  const VOID  *Src,
+  IN  UINTN       Count
+  )
+;
+
+#ifdef _MSC_EXTENSIONS
+#pragma intrinsic(memcpy)
+#else
+ VOID *
 memcpy (
   OUT VOID        *Dest,
   IN  const VOID  *Src,
@@ -43,4 +54,5 @@ memcpy (
 
   return Dest;
 }
+#endif
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
index 0f0f40db97..a51ea10a98 100644
--- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
+++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
@@ -26,7 +26,17 @@ Abstract:
 --*/
 
 #include "Tiano.h"
+VOID *
+memset (
+  OUT VOID    *Dest,
+  IN  UINTN   Char,
+  IN  UINTN   Count
+  )
+;
 
+#ifdef _MSC_EXTENSIONS
+#pragma intrinsic(memset)
+#else
 VOID *
 memset (
   OUT VOID    *Dest,
@@ -42,4 +52,5 @@ memset (
 
   return Dest;
 }
+#endif
 
-- 
2.39.2