ArmPkg/CompilerIntrinsicsLib: Remove unused sources and clean up .inf

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

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
index 0d56349599934e43a50ec12d33193d2a8c689d30..0203ecb4870fbdbccd5d938ec334af9a8f67dbfb 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
@@ -19,10 +19,12 @@
 \r
 [Sources]\r
   memcpy.c             | RVCT\r
-  memcpy.c             | GCC\r
-  memcpy_ms.c          | MSFT\r
   memset.c             | RVCT\r
+\r
+  memcpy.c             | GCC\r
   memset.c             | GCC\r
+\r
+  memcpy_ms.c          | MSFT\r
   memset_ms.c          | MSFT\r
 \r
 [Sources.ARM]\r
@@ -38,73 +40,44 @@
   Arm/uldiv.asm        | RVCT\r
   Arm/ldivmod.asm      | RVCT\r
 \r
+  Arm/ashrdi3.S        | GCC\r
+  Arm/ashldi3.S        | GCC\r
+  Arm/div.S            | GCC\r
+  Arm/divdi3.S         | GCC\r
+  Arm/divsi3.S         | GCC\r
+  Arm/lshrdi3.S        | GCC\r
+  Arm/memmove.S        | GCC\r
+  Arm/modsi3.S         | GCC\r
+  Arm/moddi3.S         | GCC\r
+  Arm/muldi3.S         | GCC\r
+  Arm/mullu.S          | GCC\r
+  Arm/udivsi3.S        | GCC\r
+  Arm/umodsi3.S        | GCC\r
+  Arm/udivdi3.S        | GCC\r
+  Arm/umoddi3.S        | GCC\r
+  Arm/udivmoddi4.S     | GCC\r
+  Arm/clzsi2.S         | GCC\r
+  Arm/ctzsi2.S         | GCC\r
+  Arm/ucmpdi2.S        | GCC\r
+  Arm/switch8.S        | GCC\r
+  Arm/switchu8.S       | GCC\r
+  Arm/switch16.S       | GCC\r
+  Arm/switch32.S       | GCC\r
+  Arm/sourcery.S       | GCC\r
+  Arm/uldiv.S          | GCC\r
+  Arm/ldivmod.S        | GCC\r
+  Arm/llsr.S           | GCC\r
+  Arm/llsl.S           | GCC\r
 \r
-#\r
-# Move .c to .s to work around LLVM issues\r
-#\r
-#  Arm/ashrdi3.c    | GCC\r
-#  Arm/ashldi3.c    | GCC\r
-#  Arm/divdi3.c     | GCC\r
-#  Arm/divsi3.c     | GCC\r
-#  Arm/lshrdi3.c    | GCC\r
-  Arm/ashrdi3.S    | GCC\r
-  Arm/ashldi3.S    | GCC\r
-  Arm/div.S        | GCC\r
-  Arm/divdi3.S     | GCC\r
-  Arm/divsi3.S     | GCC\r
-  Arm/lshrdi3.S    | GCC\r
-\r
-  Arm/memmove.S    | GCC\r
-\r
-#  Arm/modsi3.c     | GCC\r
-#  Arm/moddi3.c     | GCC\r
-#  Arm/muldi3.c     | GCC\r
-  Arm/modsi3.S     | GCC\r
-  Arm/moddi3.S     | GCC\r
-  Arm/muldi3.S     | GCC\r
-  Arm/mullu.S      | GCC\r
-\r
-#  Arm/udivsi3.c    | GCC\r
-#  Arm/umodsi3.c    | GCC\r
-#  Arm/udivdi3.c    | GCC\r
-#  Arm/umoddi3.c    | GCC\r
-#  Arm/udivmoddi4.c | GCC\r
-  Arm/udivsi3.S    | GCC\r
-  Arm/umodsi3.S    | GCC\r
-  Arm/udivdi3.S    | GCC\r
-  Arm/umoddi3.S    | GCC\r
-  Arm/udivmoddi4.S | GCC\r
-\r
-#  Arm/clzsi2.c     | GCC\r
-#  Arm/ctzsi2.c     | GCC\r
-#  Arm/ucmpdi2.c    | GCC\r
-  Arm/clzsi2.S     | GCC\r
-  Arm/ctzsi2.S     | GCC\r
-  Arm/ucmpdi2.S    | GCC\r
-  Arm/switch8.S    | GCC\r
-  Arm/switchu8.S   | GCC\r
-  Arm/switch16.S   | GCC\r
-  Arm/switch32.S   | GCC\r
-\r
-  Arm/sourcery.S   | GCC\r
-  Arm/uldiv.S      | GCC\r
-  Arm/ldivmod.S    | GCC\r
-\r
-  Arm/llsr.S       | GCC\r
-  Arm/llsl.S       | GCC\r
-\r
-  Arm/div.asm      | MSFT\r
-  Arm/uldiv.asm    | MSFT\r
-  Arm/ldivmod.asm  | MSFT\r
-  Arm/llsr.asm     | MSFT\r
+  Arm/div.asm          | MSFT\r
+  Arm/uldiv.asm        | MSFT\r
+  Arm/ldivmod.asm      | MSFT\r
+  Arm/llsr.asm         | MSFT\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   ArmPkg/ArmPkg.dec\r
 \r
-[LibraryClasses]\r
-\r
 [BuildOptions]\r
-  MSFT:*_*_ARM_CC_FLAGS = /GL-\r
+  MSFT:*_*_*_CC_FLAGS = /GL-\r
   MSFT:*_*_ARM_ASM_FLAGS = /oldit\r
-  MSFT:*_*_AARCH64_CC_FLAGS = /GL-\r