Update memcpy.c and memset.c to support both /Ox and /Os of MSFT IPF toolchain. Witho...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4630 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
index 300724a132c9c46c12cef314a518008f9d6caf44..69c45e1583912ac2c17b765cf209fa01e0d3e8fd 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
+++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c
@@ -28,6 +28,17 @@ Abstract:
 #include "Tiano.h"\r
 \r
 VOID *\r
+memcpy (\r
+  OUT VOID        *Dest,\r
+  IN  const VOID  *Src,\r
+  IN  UINTN       Count\r
+  )\r
+;\r
+\r
+#ifdef _MSC_EXTENSIONS\r
+#pragma intrinsic(memcpy)\r
+#else\r
+ VOID *\r
 memcpy (\r
   OUT VOID        *Dest,\r
   IN  const VOID  *Src,\r
@@ -43,4 +54,5 @@ memcpy (
 \r
   return Dest;\r
 }\r
+#endif\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
index 0f0f40db9732e962c1d48ee1b36399db9181b5bd..a51ea10a98298ee6afec0a2ca31c312154734196 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
+++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c
@@ -26,7 +26,17 @@ Abstract:
 --*/\r
 \r
 #include "Tiano.h"\r
+VOID *\r
+memset (\r
+  OUT VOID    *Dest,\r
+  IN  UINTN   Char,\r
+  IN  UINTN   Count\r
+  )\r
+;\r
 \r
+#ifdef _MSC_EXTENSIONS\r
+#pragma intrinsic(memset)\r
+#else\r
 VOID *\r
 memset (\r
   OUT VOID    *Dest,\r
@@ -42,4 +52,5 @@ memset (
 \r
   return Dest;\r
 }\r
+#endif\r
 \r