MdePkg BaseLib X64: Tag MSFT/INTEL for .asm routines in GccInline.c

Once the MASM code is converted to NASM, it will be linked into GCC
builds. Since GccInline.c provides these routines for GCC, we need to
prevent this linking.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>

diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index e83a569bb9ca4ef582488dd9397dd9a814c1fb21..6fa32bdc03df6feace724ba8b3a46365ddebc56a 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -308,74 +308,6 @@
 \r
 [Sources.X64]\r
   X64/Thunk16.asm\r
-  X64/CpuPause.asm\r
-  X64/EnableDisableInterrupts.asm\r
-  X64/DisableInterrupts.asm\r
-  X64/EnableInterrupts.asm\r
-  X64/FlushCacheLine.asm\r
-  X64/Invd.asm\r
-  X64/Wbinvd.asm\r
-  X64/DisablePaging64.asm\r
-  X64/Mwait.asm\r
-  X64/Monitor.asm\r
-  X64/ReadPmc.asm\r
-  X64/ReadTsc.asm\r
-  X64/WriteMm7.asm\r
-  X64/WriteMm6.asm\r
-  X64/WriteMm5.asm\r
-  X64/WriteMm4.asm\r
-  X64/WriteMm3.asm\r
-  X64/WriteMm2.asm\r
-  X64/WriteMm1.asm\r
-  X64/WriteMm0.asm\r
-  X64/ReadMm7.asm\r
-  X64/ReadMm6.asm\r
-  X64/ReadMm5.asm\r
-  X64/ReadMm4.asm\r
-  X64/ReadMm3.asm\r
-  X64/ReadMm2.asm\r
-  X64/ReadMm1.asm\r
-  X64/ReadMm0.asm\r
-  X64/FxRestore.asm\r
-  X64/FxSave.asm\r
-  X64/WriteLdtr.asm\r
-  X64/ReadLdtr.asm\r
-  X64/WriteIdtr.asm\r
-  X64/ReadIdtr.asm\r
-  X64/WriteGdtr.asm\r
-  X64/ReadGdtr.asm\r
-  X64/ReadTr.asm\r
-  X64/ReadSs.asm\r
-  X64/ReadGs.asm\r
-  X64/ReadFs.asm\r
-  X64/ReadEs.asm\r
-  X64/ReadDs.asm\r
-  X64/ReadCs.asm\r
-  X64/WriteDr7.asm\r
-  X64/WriteDr6.asm\r
-  X64/WriteDr5.asm\r
-  X64/WriteDr4.asm\r
-  X64/WriteDr3.asm\r
-  X64/WriteDr2.asm\r
-  X64/WriteDr1.asm\r
-  X64/WriteDr0.asm\r
-  X64/ReadDr7.asm\r
-  X64/ReadDr6.asm\r
-  X64/ReadDr5.asm\r
-  X64/ReadDr4.asm\r
-  X64/ReadDr3.asm\r
-  X64/ReadDr2.asm\r
-  X64/ReadDr1.asm\r
-  X64/ReadDr0.asm\r
-  X64/WriteCr4.asm\r
-  X64/WriteCr3.asm\r
-  X64/WriteCr2.asm\r
-  X64/WriteCr0.asm\r
-  X64/ReadCr4.asm\r
-  X64/ReadCr3.asm\r
-  X64/ReadCr2.asm\r
-  X64/ReadCr0.asm\r
-  X64/ReadEflags.asm\r
   X64/CpuIdEx.asm\r
   X64/CpuId.asm\r
   X64/LongJump.asm\r
@@ -388,11 +320,147 @@
   X64/WriteMsr64.c | MSFT \r
   X64/ReadMsr64.c | MSFT \r
   X64/RdRand.asm | MSFT\r
+  X64/CpuPause.asm | MSFT\r
+  X64/EnableDisableInterrupts.asm | MSFT\r
+  X64/DisableInterrupts.asm | MSFT\r
+  X64/EnableInterrupts.asm | MSFT\r
+  X64/FlushCacheLine.asm | MSFT\r
+  X64/Invd.asm | MSFT\r
+  X64/Wbinvd.asm | MSFT\r
+  X64/DisablePaging64.asm | MSFT\r
+  X64/Mwait.asm | MSFT\r
+  X64/Monitor.asm | MSFT\r
+  X64/ReadPmc.asm | MSFT\r
+  X64/ReadTsc.asm | MSFT\r
+  X64/WriteMm7.asm | MSFT\r
+  X64/WriteMm6.asm | MSFT\r
+  X64/WriteMm5.asm | MSFT\r
+  X64/WriteMm4.asm | MSFT\r
+  X64/WriteMm3.asm | MSFT\r
+  X64/WriteMm2.asm | MSFT\r
+  X64/WriteMm1.asm | MSFT\r
+  X64/WriteMm0.asm | MSFT\r
+  X64/ReadMm7.asm | MSFT\r
+  X64/ReadMm6.asm | MSFT\r
+  X64/ReadMm5.asm | MSFT\r
+  X64/ReadMm4.asm | MSFT\r
+  X64/ReadMm3.asm | MSFT\r
+  X64/ReadMm2.asm | MSFT\r
+  X64/ReadMm1.asm | MSFT\r
+  X64/ReadMm0.asm | MSFT\r
+  X64/FxRestore.asm | MSFT\r
+  X64/FxSave.asm | MSFT\r
+  X64/WriteLdtr.asm | MSFT\r
+  X64/ReadLdtr.asm | MSFT\r
+  X64/WriteIdtr.asm | MSFT\r
+  X64/ReadIdtr.asm | MSFT\r
+  X64/WriteGdtr.asm | MSFT\r
+  X64/ReadGdtr.asm | MSFT\r
+  X64/ReadTr.asm | MSFT\r
+  X64/ReadSs.asm | MSFT\r
+  X64/ReadGs.asm | MSFT\r
+  X64/ReadFs.asm | MSFT\r
+  X64/ReadEs.asm | MSFT\r
+  X64/ReadDs.asm | MSFT\r
+  X64/ReadCs.asm | MSFT\r
+  X64/WriteDr7.asm | MSFT\r
+  X64/WriteDr6.asm | MSFT\r
+  X64/WriteDr5.asm | MSFT\r
+  X64/WriteDr4.asm | MSFT\r
+  X64/WriteDr3.asm | MSFT\r
+  X64/WriteDr2.asm | MSFT\r
+  X64/WriteDr1.asm | MSFT\r
+  X64/WriteDr0.asm | MSFT\r
+  X64/ReadDr7.asm | MSFT\r
+  X64/ReadDr6.asm | MSFT\r
+  X64/ReadDr5.asm | MSFT\r
+  X64/ReadDr4.asm | MSFT\r
+  X64/ReadDr3.asm | MSFT\r
+  X64/ReadDr2.asm | MSFT\r
+  X64/ReadDr1.asm | MSFT\r
+  X64/ReadDr0.asm | MSFT\r
+  X64/WriteCr4.asm | MSFT\r
+  X64/WriteCr3.asm | MSFT\r
+  X64/WriteCr2.asm | MSFT\r
+  X64/WriteCr0.asm | MSFT\r
+  X64/ReadCr4.asm | MSFT\r
+  X64/ReadCr3.asm | MSFT\r
+  X64/ReadCr2.asm | MSFT\r
+  X64/ReadCr0.asm | MSFT\r
+  X64/ReadEflags.asm | MSFT\r
 \r
   X64/CpuBreakpoint.asm | INTEL \r
   X64/WriteMsr64.asm | INTEL \r
   X64/ReadMsr64.asm | INTEL \r
   X64/RdRand.asm | INTEL\r
+  X64/CpuPause.asm | INTEL\r
+  X64/EnableDisableInterrupts.asm | INTEL\r
+  X64/DisableInterrupts.asm | INTEL\r
+  X64/EnableInterrupts.asm | INTEL\r
+  X64/FlushCacheLine.asm | INTEL\r
+  X64/Invd.asm | INTEL\r
+  X64/Wbinvd.asm | INTEL\r
+  X64/DisablePaging64.asm | INTEL\r
+  X64/Mwait.asm | INTEL\r
+  X64/Monitor.asm | INTEL\r
+  X64/ReadPmc.asm | INTEL\r
+  X64/ReadTsc.asm | INTEL\r
+  X64/WriteMm7.asm | INTEL\r
+  X64/WriteMm6.asm | INTEL\r
+  X64/WriteMm5.asm | INTEL\r
+  X64/WriteMm4.asm | INTEL\r
+  X64/WriteMm3.asm | INTEL\r
+  X64/WriteMm2.asm | INTEL\r
+  X64/WriteMm1.asm | INTEL\r
+  X64/WriteMm0.asm | INTEL\r
+  X64/ReadMm7.asm | INTEL\r
+  X64/ReadMm6.asm | INTEL\r
+  X64/ReadMm5.asm | INTEL\r
+  X64/ReadMm4.asm | INTEL\r
+  X64/ReadMm3.asm | INTEL\r
+  X64/ReadMm2.asm | INTEL\r
+  X64/ReadMm1.asm | INTEL\r
+  X64/ReadMm0.asm | INTEL\r
+  X64/FxRestore.asm | INTEL\r
+  X64/FxSave.asm | INTEL\r
+  X64/WriteLdtr.asm | INTEL\r
+  X64/ReadLdtr.asm | INTEL\r
+  X64/WriteIdtr.asm | INTEL\r
+  X64/ReadIdtr.asm | INTEL\r
+  X64/WriteGdtr.asm | INTEL\r
+  X64/ReadGdtr.asm | INTEL\r
+  X64/ReadTr.asm | INTEL\r
+  X64/ReadSs.asm | INTEL\r
+  X64/ReadGs.asm | INTEL\r
+  X64/ReadFs.asm | INTEL\r
+  X64/ReadEs.asm | INTEL\r
+  X64/ReadDs.asm | INTEL\r
+  X64/ReadCs.asm | INTEL\r
+  X64/WriteDr7.asm | INTEL\r
+  X64/WriteDr6.asm | INTEL\r
+  X64/WriteDr5.asm | INTEL\r
+  X64/WriteDr4.asm | INTEL\r
+  X64/WriteDr3.asm | INTEL\r
+  X64/WriteDr2.asm | INTEL\r
+  X64/WriteDr1.asm | INTEL\r
+  X64/WriteDr0.asm | INTEL\r
+  X64/ReadDr7.asm | INTEL\r
+  X64/ReadDr6.asm | INTEL\r
+  X64/ReadDr5.asm | INTEL\r
+  X64/ReadDr4.asm | INTEL\r
+  X64/ReadDr3.asm | INTEL\r
+  X64/ReadDr2.asm | INTEL\r
+  X64/ReadDr1.asm | INTEL\r
+  X64/ReadDr0.asm | INTEL\r
+  X64/WriteCr4.asm | INTEL\r
+  X64/WriteCr3.asm | INTEL\r
+  X64/WriteCr2.asm | INTEL\r
+  X64/WriteCr0.asm | INTEL\r
+  X64/ReadCr4.asm | INTEL\r
+  X64/ReadCr3.asm | INTEL\r
+  X64/ReadCr2.asm | INTEL\r
+  X64/ReadCr0.asm | INTEL\r
+  X64/ReadEflags.asm | INTEL\r
 \r
   X64/Non-existing.c\r
   Math64.c\r