1) Revert the original CompilerStubLib.inf which will be built by EDK tool chain. CompilerStubLib_Edk2.inf is the one that should be built by EDK II tool chain.

2) Revert the memcpy.c and memset.c. We use CompilerStubLib_Edk2.inf to switch the file combinations that are built under differnt tool-chains.

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

EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf

@@ -24,19 +24,18 @@ BASE_NAME       = CompilerStub
 COMPONENT_TYPE  = LIBRARY
 
 [sources.common] 
-  Dummy.c
 
 [sources.ia32]
-  Ia32/memcpyRep1.asm
+  Ia32\memcpyRep1.asm
-  Ia32/memsetRep4.asm
+  Ia32\memsetRep4.asm
-#  Ia32/memcpy.asm
+#  Ia32\memcpy.asm
-#  Ia32/memset.asm
+#  Ia32\memset.asm
   
 [sources.x64]  
-  X64/memcpyRep1.asm
+  x64\memcpyRep1.asm
-  X64/memsetRep4.asm
+  x64\memsetRep4.asm
-#  X64/memcpy.asm
+#  x64\memcpy.asm
-#  X64/memset.asm
+#  x64\memset.asm
   
 [sources.Ipf]  
   memcpy.c

EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c

@@ -28,16 +28,6 @@ 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,
@@ -53,5 +43,4 @@ memcpy (
 
   return Dest;
 }
-#endif
 

EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c

@@ -26,16 +26,7 @@ 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,
@@ -51,5 +42,4 @@ memset (
 
   return Dest;
 }
-#endif