9 files changed, 18 insertions, 18 deletions
diff --git a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf b/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
index 12cb2fc3ee..0ea5949a03 100644
--- a/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
+++ b/SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
@@ -42,12 +42,12 @@
 
 [Sources.IA32]
   IA32/RdRandWord.c
-  IA32/AsmRdRand.asm        | MSFT
+  IA32/AsmRdRand.asm
   IA32/GccRdRand.c          | GCC
 
 [Sources.X64]
   X64/RdRandWord.c
-  X64/AsmRdRand.asm         | MSFT
+  X64/AsmRdRand.asm
   X64/GccRdRand.c           | GCC
 
 [Packages]
diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
index e5a510d4b3..0a3a519042 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
@@ -42,14 +42,14 @@
 
 [Sources.Ia32]
   DebugAgentCommon/Ia32/AsmFuncs.S     | GCC
-  DebugAgentCommon/Ia32/AsmFuncs.asm   | MSFT
+  DebugAgentCommon/Ia32/AsmFuncs.asm
   DebugAgentCommon/Ia32/ArchDebugSupport.h
   DebugAgentCommon/Ia32/ArchDebugSupport.c
   DebugAgentCommon/Ia32/DebugException.h
 
 [Sources.X64]
   DebugAgentCommon/X64/AsmFuncs.S      | GCC
-  DebugAgentCommon/X64/AsmFuncs.asm    | MSFT
+  DebugAgentCommon/X64/AsmFuncs.asm
   DebugAgentCommon/X64/ArchDebugSupport.h
   DebugAgentCommon/X64/ArchDebugSupport.c
   DebugAgentCommon/X64/DebugException.h
diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
index 5204abca52..8de4cbd9ee 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
@@ -39,14 +39,14 @@
 
 [Sources.Ia32]
   DebugAgentCommon/Ia32/AsmFuncs.S     | GCC
-  DebugAgentCommon/Ia32/AsmFuncs.asm   | MSFT
+  DebugAgentCommon/Ia32/AsmFuncs.asm
   DebugAgentCommon/Ia32/ArchDebugSupport.h
   DebugAgentCommon/Ia32/ArchDebugSupport.c
   DebugAgentCommon/Ia32/DebugException.h
 
 [Sources.X64]
   DebugAgentCommon/X64/AsmFuncs.S      | GCC
-  DebugAgentCommon/X64/AsmFuncs.asm    | MSFT
+  DebugAgentCommon/X64/AsmFuncs.asm
   DebugAgentCommon/X64/ArchDebugSupport.h
   DebugAgentCommon/X64/ArchDebugSupport.c
   DebugAgentCommon/X64/DebugException.h
diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf
index 2878c3189f..048481ebaa 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf
+++ b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf
@@ -39,14 +39,14 @@
 
 [Sources.Ia32]
   DebugAgentCommon/Ia32/AsmFuncs.S     | GCC
-  DebugAgentCommon/Ia32/AsmFuncs.asm   | MSFT
+  DebugAgentCommon/Ia32/AsmFuncs.asm
   DebugAgentCommon/Ia32/ArchDebugSupport.h
   DebugAgentCommon/Ia32/ArchDebugSupport.c
   DebugAgentCommon/Ia32/DebugException.h
 
 [Sources.X64]
   DebugAgentCommon/X64/AsmFuncs.S      | GCC
-  DebugAgentCommon/X64/AsmFuncs.asm    | MSFT
+  DebugAgentCommon/X64/AsmFuncs.asm
   DebugAgentCommon/X64/ArchDebugSupport.h
   DebugAgentCommon/X64/ArchDebugSupport.c
   DebugAgentCommon/X64/DebugException.h
diff --git a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
index fa485bcf18..9310ccfe83 100644
--- a/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
+++ b/SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf
@@ -33,12 +33,12 @@
 
 [Sources.IA32]
   Ia32/IntHandlerFuncs.c
-  Ia32/IntHandler.asm     | MSFT
+  Ia32/IntHandler.asm
   Ia32/IntHandler.S       | GCC
 
 [Sources.X64]
   X64/IntHandlerFuncs.c
-  X64/IntHandler.asm      | MSFT
+  X64/IntHandler.asm
   X64/IntHandler.S        | GCC
 
 [Packages]
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
index 3887086765..b8bf4ebd17 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
@@ -29,13 +29,13 @@
 #
 
 [Sources.Ia32]
-  Ia32/ExceptionHandlerAsm.asm |MSFT
+  Ia32/ExceptionHandlerAsm.asm
   Ia32/ExceptionHandlerAsm.S   |GCC
   Ia32/ArchExceptionHandler.c
   Ia32/ArchInterruptDefs.h
 
 [Sources.X64]
-  X64/ExceptionHandlerAsm.asm   |MSFT
+  X64/ExceptionHandlerAsm.asm
   X64/ExceptionHandlerAsm.S     |GCC
   X64/ArchExceptionHandler.c
   X64/ArchInterruptDefs.h
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
index 159d3c61f5..6a3a163c9e 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
@@ -29,13 +29,13 @@
 #
 
 [Sources.Ia32]
-  Ia32/ExceptionHandlerAsm.asm |MSFT
+  Ia32/ExceptionHandlerAsm.asm
   Ia32/ExceptionHandlerAsm.S   |GCC
   Ia32/ArchExceptionHandler.c
   Ia32/ArchInterruptDefs.h
 
 [Sources.X64]
-  X64/ExceptionHandlerAsm.asm |MSFT
+  X64/ExceptionHandlerAsm.asm
   X64/ExceptionHandlerAsm.S   |GCC
   X64/ArchExceptionHandler.c
   X64/ArchInterruptDefs.h
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
index 9fe87be8a2..2fe7ac3ca6 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
@@ -29,13 +29,13 @@
 #
 
 [Sources.Ia32]
-  Ia32/ExceptionHandlerAsm.asm |MSFT
+  Ia32/ExceptionHandlerAsm.asm
   Ia32/ExceptionHandlerAsm.S   |GCC
   Ia32/ArchExceptionHandler.c
   Ia32/ArchInterruptDefs.h
 
 [Sources.X64]
-  X64/ExceptionHandlerAsm.asm   |MSFT
+  X64/ExceptionHandlerAsm.asm
   X64/ExceptionHandlerAsm.S     |GCC
   X64/ArchExceptionHandler.c
   X64/ArchInterruptDefs.h
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index db5d66e7fb..6b29d05c07 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -34,11 +34,11 @@
   S3Resume.c
 
 [Sources.IA32]
-  Ia32/AsmFuncs.asm  | MSFT
+  Ia32/AsmFuncs.asm
   Ia32/AsmFuncs.S    | GCC
 
 [Sources.X64]
-  X64/AsmFuncs.asm   | MSFT
+  X64/AsmFuncs.asm
   X64/AsmFuncs.S     | GCC
 
 [Packages]