Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EfiCommonLib / EfiCommonLib.inf

diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
index 561345fb5d7d4b5fad354340f3227ecb48d40c57..722c9a966408fe06756f6762ade7b0389d3f0f9e 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/EfiCommonLib.inf
@@ -1,7 +1,7 @@
 #/*++\r
 #\r
-#  Copyright (c) 2004 - 2007, Intel Corporation                                                         \r
-#  All rights reserved. This program and the accompanying materials                          \r
+#  Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
+#  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
 #  which accompanies this distribution.  The full text of the license may be found at        \r
 #  http://opensource.org/licenses/bsd-license.php                                            \r
@@ -33,16 +33,19 @@ COMPONENT_TYPE  = LIBRARY
   LinkedList.c\r
 \r
 [sources.ia32]\r
-  Ia32\EfiCopyMem.c\r
-  Ia32\EfiSetMem.c\r
-  Ia32\EfiZeroMem.c\r
-  Ia32\LShiftU64.c\r
-  Ia32\RShiftU64.c\r
-  Ia32\MultU64x32.c\r
-  Ia32\DivU64x32.c\r
-  Ia32\Power10U64.c\r
-  Ia32\Log2.c\r
-  Ia32\GetPowerOfTwo.c\r
+  Ia32/EfiCopyMemRep1.c\r
+  Ia32/EfiSetMemRep4.c\r
+  Ia32/EfiZeroMemRep4.c\r
+#  Ia32/EfiCopyMem.c\r
+#  Ia32/EfiSetMem.c\r
+#  Ia32/EfiZeroMem.c\r
+  Ia32/LShiftU64.c\r
+  Ia32/RShiftU64.c\r
+  Ia32/MultU64x32.c\r
+  Ia32/DivU64x32.c\r
+  Ia32/Power10U64.c\r
+  Ia32/Log2.c\r
+  Ia32/GetPowerOfTwo.c\r
 \r
 [sources.ipf]\r
   EfiCopyMem.c\r
@@ -57,28 +60,41 @@ COMPONENT_TYPE  = LIBRARY
   Math.c\r
   \r
 [sources.x64]\r
-  x64\EfiCopyMem.asm\r
-  x64\EfiSetMem.asm\r
-  x64\EfiZeroMem.asm\r
+  X64/EfiCopyMemRep4.asm\r
+  X64/EfiSetMemRep4.asm\r
+  X64/EfiZeroMemRep4.asm\r
+#  X64/EfiCopyMem.asm\r
+#  X64/EfiSetMem.asm\r
+#  X64/EfiZeroMem.asm\r
   Math.c\r
 \r
+[sources.ARM]\r
+  EfiCopyMem.c\r
+  EfiSetMem.c\r
+  EfiZeroMem.c\r
+  Math.c\r
+\r
+\r
 [includes.common]\r
-  $(EDK_SOURCE)\Foundation\r
-  $(EDK_SOURCE)\Foundation\Framework\r
-  $(EDK_SOURCE)\Foundation\Efi\r
-  $(EDK_SOURCE)\Foundation\Include\r
-  $(EDK_SOURCE)\Foundation\Efi\Include\r
-  $(EDK_SOURCE)\Foundation\Framework\Include\r
-  $(EDK_SOURCE)\Foundation\Include\IndustryStandard\r
+  $(EDK_SOURCE)/Foundation\r
+  $(EDK_SOURCE)/Foundation/Framework\r
+  $(EDK_SOURCE)/Foundation/Efi\r
+  $(EDK_SOURCE)/Foundation/Include\r
+  $(EDK_SOURCE)/Foundation/Efi/Include\r
+  $(EDK_SOURCE)/Foundation/Framework/Include\r
+  $(EDK_SOURCE)/Foundation/Include/IndustryStandard\r
   $(EDK_SOURCE)\r
-  $(EDK_SOURCE)\Foundation\Core\Dxe\r
-  $(EDK_SOURCE)\Foundation\Library\Dxe\Include\r
-  $(EDK_SOURCE)\Foundation\Include\Pei\r
-  $(EDK_SOURCE)\Foundation\Library\Pei\Include\r
-  $(EDK_SOURCE)\Foundation\Framework\Ppi\CpuIo\r
-  $(EDK_SOURCE)\Foundation\Framework\r
+  $(EDK_SOURCE)/Foundation/Core/Dxe\r
+  $(EDK_SOURCE)/Foundation/Library/Dxe/Include\r
+  $(EDK_SOURCE)/Foundation/Include/Pei\r
+  $(EDK_SOURCE)/Foundation/Library/Pei/Include\r
+  $(EDK_SOURCE)/Foundation/Framework/Ppi/CpuIo\r
+  $(EDK_SOURCE)/Foundation/Framework\r
   \r
 [libraries.common]\r
   EdkFrameworkGuidLib\r
 \r
+[libraries.ARM]
+  CompilerIntrinsicsLib
+\r
 [nmake.common]\r