11 files changed, 20 insertions, 20 deletions
diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
index c30cec6090..e0d5190e55 100644
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
@@ -49,7 +49,7 @@
 [Sources.AARCH64]
   AArch64/Mmu.c
   AArch64/Exception.c
-  AArch64/ExceptionSupport.S   | GCC
+  AArch64/ExceptionSupport.S
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf
index 06824e5e75..e5247848b5 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf
@@ -25,11 +25,11 @@
   AArch64Lib.c
   AArch64Mmu.c
   AArch64ArchTimer.c
-  ArmLibSupportV8.S                   | GCC
-  AArch64Support.S                    | GCC
-  AArch64ArchTimerSupport.S           | GCC
+  ArmLibSupportV8.S
+  AArch64Support.S
+  AArch64ArchTimerSupport.S
 
-  ../Common/AArch64/ArmLibSupport.S   | GCC
+  ../Common/AArch64/ArmLibSupport.S
   ../Common/ArmLib.c
 
 [Packages]
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf b/ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf
index 42f7e56287..3a99e1b713 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf
@@ -22,17 +22,17 @@
   LIBRARY_CLASS                  = ArmLib
 
 [Sources.common]
-  ArmLibSupportV8.S                   | GCC
-  AArch64Support.S                    | GCC
+  ArmLibSupportV8.S
+  AArch64Support.S
 
-  ../Common/AArch64/ArmLibSupport.S   | GCC
+  ../Common/AArch64/ArmLibSupport.S
   ../Common/ArmLib.c
 
   AArch64Lib.c
   AArch64Mmu.c
 
   AArch64ArchTimer.c
-  AArch64ArchTimerSupport.S           | GCC
+  AArch64ArchTimerSupport.S
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf b/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf
index c273718b33..57ac694cd7 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf
@@ -21,16 +21,16 @@
   LIBRARY_CLASS                  = ArmLib
 
 [Sources.common]
-  ArmLibSupportV8.S                   | GCC
-  AArch64Support.S                    | GCC
+  ArmLibSupportV8.S
+  AArch64Support.S
 
-  ../Common/AArch64/ArmLibSupport.S   | GCC
+  ../Common/AArch64/ArmLibSupport.S
   ../Common/ArmLib.c
 
   AArch64Lib.c
 
   AArch64ArchTimer.c
-  AArch64ArchTimerSupport.S           | GCC
+  AArch64ArchTimerSupport.S
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf b/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
index f6d8b19429..21c374f0b2 100644
--- a/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
+++ b/ArmPkg/Library/ArmLib/Null/NullArmLib.inf
@@ -32,7 +32,7 @@
   ../Common/Arm/ArmLibSupport.asm  | RVCT
 
 [Sources.AARCH64]
-  ../Common/AArch64/ArmLibSupport.S    | GCC
+  ../Common/AArch64/ArmLibSupport.S
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
index f07a569ddb..e4f64058dc 100644
--- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
+++ b/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
@@ -24,7 +24,7 @@
   Arm/ArmSmc.S      | GCC
 
 [Sources.AARCH64]
-  AArch64/ArmSmc.S    | GCC
+  AArch64/ArmSmc.S
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf b/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
index 51006e78bb..ebe1ae14d6 100644
--- a/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
+++ b/ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf
@@ -27,7 +27,7 @@
   Arm/ArmSmcNull.S      | GCC
 
 [Sources.AARCH64]
-  AArch64/ArmSmcNull.S    | GCC
+  AArch64/ArmSmcNull.S
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/ArmPkg/Library/BdsLib/BdsLib.inf b/ArmPkg/Library/BdsLib/BdsLib.inf
index 6f295ffe56..30746f69a7 100644
--- a/ArmPkg/Library/BdsLib/BdsLib.inf
+++ b/ArmPkg/Library/BdsLib/BdsLib.inf
@@ -33,7 +33,7 @@
 
 [Sources.AARCH64]
   AArch64/BdsLinuxLoader.c
-  AArch64/BdsLinuxLoaderHelper.S  | GCC
+  AArch64/BdsLinuxLoaderHelper.S
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
index d230da2969..ace30e82ff 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
@@ -23,7 +23,7 @@
   LIBRARY_CLASS                  = CompilerIntrinsicsLib 
 
 [Sources.AARCH64]
-  AArch64/memcpy.S        | GCC
+  AArch64/memcpy.S
   AArch64/memset.c
 
 [Sources.ARM]
diff --git a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf b/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf
index f7dfa01d51..578bc71bb7 100644
--- a/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf
+++ b/ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf
@@ -27,7 +27,7 @@
   Arm/DebugAgentException.S          | GCC
 
 [Sources.AARCH64]
-  AArch64/DebugAgentException.S      | GCC
+  AArch64/DebugAgentException.S
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.inf b/ArmPkg/Library/SemihostLib/SemihostLib.inf
index 78727780a9..460f4cd71a 100644
--- a/ArmPkg/Library/SemihostLib/SemihostLib.inf
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.inf
@@ -35,7 +35,7 @@
   Arm/GccSemihost.S | GCC
 
 [Sources.AARCH64]
-  AArch64/GccSemihost.S | GCC
+  AArch64/GccSemihost.S
 
 [Packages]
   MdePkg/MdePkg.dec