X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ArmPkg%2FLibrary%2FCompilerIntrinsicsLib%2FCompilerIntrinsicsLib.inf;h=fcf48c67811906d8633fefb8fafa3a0e9d3eada9;hp=14e88da7ce06d2962828f3ccc248307c08fcfb47;hb=HEAD;hpb=e58427e3964e50caf274d4ba84a984f0cdfcd90d

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
index 14e88da7ce..7e22e6f67b 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
@@ -4,12 +4,7 @@
 #  Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
 #  Copyright (c) 2011-2013, ARM Limited. All rights reserved.
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution. The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
 #**/
@@ -23,93 +18,59 @@
   LIBRARY_CLASS                  = CompilerIntrinsicsLib
 
 [Sources]
-  memcpy.c             | RVCT
   memcpy.c             | GCC
-  memcpy_ms.c          | MSFT
-  memset.c             | RVCT
   memset.c             | GCC
+
+  memcpy_ms.c          | MSFT
   memset_ms.c          | MSFT
+  memcmp_ms.c          | MSFT
+  memmove_ms.c         | MSFT
 
 [Sources.ARM]
-  Arm/mullu.asm        | RVCT
-  Arm/switch.asm       | RVCT
-  Arm/llsr.asm         | RVCT
-  Arm/memmove.asm      | RVCT
-  Arm/uread.asm        | RVCT
-  Arm/uwrite.asm       | RVCT
-  Arm/lasr.asm         | RVCT
-  Arm/llsl.asm         | RVCT
-  Arm/div.asm          | RVCT
-  Arm/uldiv.asm        | RVCT
-  Arm/ldivmod.asm      | RVCT
-
-
-#
-# Move .c to .s to work around LLVM issues
-#
-#  Arm/ashrdi3.c    | GCC
-#  Arm/ashldi3.c    | GCC
-#  Arm/divdi3.c     | GCC
-#  Arm/divsi3.c     | GCC
-#  Arm/lshrdi3.c    | GCC
-  Arm/ashrdi3.S    | GCC
-  Arm/ashldi3.S    | GCC
-  Arm/div.S        | GCC
-  Arm/divdi3.S     | GCC
-  Arm/divsi3.S     | GCC
-  Arm/lshrdi3.S    | GCC
+  Arm/ashrdi3.S        | GCC
+  Arm/ashldi3.S        | GCC
+  Arm/div.S            | GCC
+  Arm/divdi3.S         | GCC
+  Arm/divsi3.S         | GCC
+  Arm/lshrdi3.S        | GCC
+  Arm/memmove.S        | GCC
+  Arm/modsi3.S         | GCC
+  Arm/moddi3.S         | GCC
+  Arm/muldi3.S         | GCC
+  Arm/mullu.S          | GCC
+  Arm/udivsi3.S        | GCC
+  Arm/umodsi3.S        | GCC
+  Arm/udivdi3.S        | GCC
+  Arm/umoddi3.S        | GCC
+  Arm/udivmoddi4.S     | GCC
+  Arm/clzsi2.S         | GCC
+  Arm/ctzsi2.S         | GCC
+  Arm/ucmpdi2.S        | GCC
+  Arm/switch8.S        | GCC
+  Arm/switchu8.S       | GCC
+  Arm/switch16.S       | GCC
+  Arm/switch32.S       | GCC
+  Arm/sourcery.S       | GCC
+  Arm/uldiv.S          | GCC
+  Arm/ldivmod.S        | GCC
+  Arm/lasr.S           | GCC
+  Arm/llsr.S           | GCC
+  Arm/llsl.S           | GCC
+  Arm/uread.S          | GCC
+  Arm/uwrite.S         | GCC
 
-  Arm/memmove.S    | GCC
+  Arm/div.asm          | MSFT
+  Arm/uldiv.asm        | MSFT
+  Arm/ldivmod.asm      | MSFT
+  Arm/llsr.asm         | MSFT
 
-#  Arm/modsi3.c     | GCC
-#  Arm/moddi3.c     | GCC
-#  Arm/muldi3.c     | GCC
-  Arm/modsi3.S     | GCC
-  Arm/moddi3.S     | GCC
-  Arm/muldi3.S     | GCC
-  Arm/mullu.S      | GCC
-
-#  Arm/udivsi3.c    | GCC
-#  Arm/umodsi3.c    | GCC
-#  Arm/udivdi3.c    | GCC
-#  Arm/umoddi3.c    | GCC
-#  Arm/udivmoddi4.c | GCC
-  Arm/udivsi3.S    | GCC
-  Arm/umodsi3.S    | GCC
-  Arm/udivdi3.S    | GCC
-  Arm/umoddi3.S    | GCC
-  Arm/udivmoddi4.S | GCC
-
-#  Arm/clzsi2.c     | GCC
-#  Arm/ctzsi2.c     | GCC
-#  Arm/ucmpdi2.c    | GCC
-  Arm/clzsi2.S     | GCC
-  Arm/ctzsi2.S     | GCC
-  Arm/ucmpdi2.S    | GCC
-  Arm/switch8.S    | GCC
-  Arm/switchu8.S   | GCC
-  Arm/switch16.S   | GCC
-  Arm/switch32.S   | GCC
-
-  Arm/sourcery.S   | GCC
-  Arm/uldiv.S      | GCC
-  Arm/ldivmod.S    | GCC
-
-  Arm/llsr.S       | GCC
-  Arm/llsl.S       | GCC
-
-  Arm/div.asm      | MSFT
-  Arm/uldiv.asm    | MSFT
-  Arm/ldivmod.asm  | MSFT
-  Arm/llsr.asm     | MSFT
+[Sources.AARCH64]
+  AArch64/Atomics.S    | GCC
 
 [Packages]
   MdePkg/MdePkg.dec
   ArmPkg/ArmPkg.dec
 
-[LibraryClasses]
-
 [BuildOptions]
-  MSFT:*_*_ARM_CC_FLAGS = /GL-
+  MSFT:*_*_*_CC_FLAGS = /GL-
   MSFT:*_*_ARM_ASM_FLAGS = /oldit
-  MSFT:*_*_AARCH64_CC_FLAGS = /GL-