ArmPkg: move RVCT PLATFORM_FLAGS override into ArmHvcLib/ArmSmcLib

[mirror_edk2.git] / ArmPkg / Library / CompilerIntrinsicsLib / CompilerIntrinsicsLib.inf

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
index a1c9ae65b05b72239c34139bf8be787eb5035ba8..44333141a70ab6c2113a233e80d0bb44a93461fd 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
@@ -22,17 +22,14 @@
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = CompilerIntrinsicsLib\r
 \r
-[Sources.AARCH64]\r
-  AArch64/memcpy.S\r
-  AArch64/memset.c\r
+[Sources]\r
+  memcpy.c\r
+  memset.c\r
 \r
 [Sources.ARM]\r
   Arm/mullu.asm        | RVCT\r
   Arm/switch.asm       | RVCT\r
   Arm/llsr.asm         | RVCT\r
-  Arm/memcpy.asm       | RVCT\r
-  Arm/memcpy4.asm      | RVCT\r
-  Arm/memset.asm       | RVCT\r
   Arm/memmove.asm      | RVCT\r
   Arm/uread.asm        | RVCT\r
   Arm/uwrite.asm       | RVCT\r
@@ -58,8 +55,7 @@
   Arm/divsi3.S     | GCC\r
   Arm/lshrdi3.S    | GCC\r
 \r
-  Arm/memcpy.S     | GCC\r
-  Arm/memset.S     | GCC\r
+  Arm/memmove.S    | GCC\r
 \r
 #  Arm/modsi3.c     | GCC\r
 #  Arm/moddi3.c     | GCC\r
@@ -101,6 +97,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+  ArmPkg/ArmPkg.dec\r
 \r
 [LibraryClasses]\r
 \r