diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-11-29 07:36:43 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-11-29 07:36:43 +0000 |
| commit | bc4c047f7b7cdafcfc655216796db13fe59f11f5 (patch) | |
| tree | f912e9f60b1149b7d73477a788ba512276165a25 /EdkCompatibilityPkg | |
| parent | b058028b67743fb0c4d5c18ccb37de8445311643 (diff) | |
| download | edk2-bc4c047f7b7cdafcfc655216796db13fe59f11f5.zip edk2-bc4c047f7b7cdafcfc655216796db13fe59f11f5.tar.gz edk2-bc4c047f7b7cdafcfc655216796db13fe59f11f5.tar.bz2 | |
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
Diffstat (limited to 'EdkCompatibilityPkg')
3 files changed, 8 insertions, 30 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf index f93db8a..fdfb0af 100644 --- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/CompilerStubLib.inf +++ b/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/memsetRep4.asm
-# Ia32/memcpy.asm
-# Ia32/memset.asm
+ Ia32\memcpyRep1.asm
+ Ia32\memsetRep4.asm
+# Ia32\memcpy.asm
+# Ia32\memset.asm
[sources.x64]
- X64/memcpyRep1.asm
- X64/memsetRep4.asm
-# X64/memcpy.asm
-# X64/memset.asm
+ x64\memcpyRep1.asm
+ x64\memsetRep4.asm
+# x64\memcpy.asm
+# x64\memset.asm
[sources.Ipf]
memcpy.c
diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c index 7439e31..300724a 100644 --- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c +++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c @@ -32,16 +32,6 @@ 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,
- IN UINTN Count
)
{
volatile UINT8 *Ptr;
@@ -53,5 +43,4 @@ memcpy ( return Dest;
}
-#endif
diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c index 3dc4422..0f0f40d 100644 --- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c +++ b/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
|