Fixed the GCC assembler issue. Now we can use full GCC tools to build our package.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@795 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 133 insertions, 2 deletions

diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/MdePkg/Library/BaseLib/BaseLib.msa
index 8d7af00fec..ae3cae71c5 100644
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ b/MdePkg/Library/BaseLib/BaseLib.msa
@@ -175,6 +175,104 @@
     <Filename SupArchList="IA32">Ia32/CpuBreakpoint.asm</Filename>

     <Filename SupArchList="IA32">Ia32/CpuFlushTlb.asm</Filename>

     <Filename SupArchList="IA32">Ia32/Thunk16.asm</Filename>

+    <!-- GCC assembly code is with .S extension -->

+    <Filename SupArchList="IA32">Ia32/LShiftU64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/RShiftU64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ARShiftU64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/LRotU64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/RRotU64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/MultU64x32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/MultU64x64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/DivU64x32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ModU64x32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/DivU64x32Remainder.S</Filename>

+    <Filename SupArchList="IA32">Ia32/DivU64x64Remainder.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SwapBytes64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetJump.S</Filename>

+    <Filename SupArchList="IA32">Ia32/LongJump.S</Filename>

+    <Filename SupArchList="IA32">Ia32/CpuId.S</Filename>

+    <Filename SupArchList="IA32">Ia32/CpuIdEx.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadEflags.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadMsr64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMsr32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMsr64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadCr0.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadCr2.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadCr3.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadCr4.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteCr0.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteCr2.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteCr3.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteCr4.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadDr0.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadDr1.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadDr2.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadDr3.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadDr4.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadDr5.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadDr6.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadDr7.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteDr0.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteDr1.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteDr2.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteDr3.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteDr4.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteDr5.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteDr6.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteDr7.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadCs.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadDs.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadEs.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadFs.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadGs.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadSs.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadTr.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadGdtr.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteGdtr.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadIdtr.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteIdtr.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadLdtr.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteLdtr.S</Filename>

+    <Filename SupArchList="IA32">Ia32/FxSave.S</Filename>

+    <Filename SupArchList="IA32">Ia32/FxRestore.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadMm0.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadMm1.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadMm2.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadMm3.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadMm4.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadMm5.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadMm6.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadMm7.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMm0.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMm1.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMm2.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMm3.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMm4.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMm5.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMm6.S</Filename>

+    <Filename SupArchList="IA32">Ia32/WriteMm7.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadTsc.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ReadPmc.S</Filename>

+    <Filename SupArchList="IA32">Ia32/Monitor.S</Filename>

+    <Filename SupArchList="IA32">Ia32/Mwait.S</Filename>

+    <Filename SupArchList="IA32">Ia32/EnablePaging32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/DisablePaging32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/EnablePaging64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/Wbinvd.S</Filename>

+    <Filename SupArchList="IA32">Ia32/Invd.S</Filename>

+    <Filename SupArchList="IA32">Ia32/FlushCacheLine.S</Filename>

+    <Filename SupArchList="IA32">Ia32/InterlockedIncrement.S</Filename>

+    <Filename SupArchList="IA32">Ia32/InterlockedDecrement.S</Filename>

+    <Filename SupArchList="IA32">Ia32/InterlockedCompareExchange32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/InterlockedCompareExchange64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/EnableInterrupts.S</Filename>

+    <Filename SupArchList="IA32">Ia32/DisableInterrupts.S</Filename>

+    <Filename SupArchList="IA32">Ia32/EnableDisableInterrupts.S</Filename>

+    <Filename SupArchList="IA32">Ia32/CpuSleep.S</Filename>

+    <Filename SupArchList="IA32">Ia32/CpuPause.S</Filename>

+    <Filename SupArchList="IA32">Ia32/CpuBreakpoint.S</Filename>

+    <Filename SupArchList="IA32">Ia32/CpuFlushTlb.S</Filename>

+    <Filename SupArchList="IA32">Ia32/Thunk16.S</Filename>

     <Filename SupArchList="X64">X86LowLevel.c</Filename>

     <Filename SupArchList="X64">X86Thunk.c</Filename>

     <Filename SupArchList="X64">Unaligned.c</Filename>

diff --git a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
index 1c8c6b06c1..99d6dba269 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
+++ b/MdePkg/Library/BaseMemoryLibMmx/BaseMemoryLibMmx.msa
@@ -56,6 +56,17 @@
     <Filename SupArchList="IA32">Ia32/ScanMem16.asm</Filename>

     <Filename SupArchList="IA32">Ia32/ScanMem32.asm</Filename>

     <Filename SupArchList="IA32">Ia32/ScanMem64.asm</Filename>

+    <Filename SupArchList="IA32">Ia32/CopyMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ZeroMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem16.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/CompareMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem8.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem16.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem64.S</Filename>

     <Filename SupArchList="X64">X64/CopyMem.asm</Filename>

     <Filename SupArchList="X64">X64/SetMem.asm</Filename>

     <Filename SupArchList="X64">X64/SetMem16.asm</Filename>

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
index 1aad519301..d3fa91d59b 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
+++ b/MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.msa
@@ -56,6 +56,17 @@
     <Filename SupArchList="IA32">Ia32/ScanMem16.asm</Filename>

     <Filename SupArchList="IA32">Ia32/ScanMem32.asm</Filename>

     <Filename SupArchList="IA32">Ia32/ScanMem64.asm</Filename>

+    <Filename SupArchList="IA32">Ia32/CopyMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem16.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ZeroMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/CompareMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem8.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem16.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem64.S</Filename>

     <Filename SupArchList="X64">MemLibGuid.c</Filename>

     <Filename SupArchList="X64">CopyMemWrapper.c</Filename>

     <Filename SupArchList="X64">SetMemWrapper.c</Filename>

diff --git a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
index 7c8798da7e..bfbfdf869c 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
+++ b/MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.msa
@@ -56,6 +56,17 @@
     <Filename SupArchList="IA32">Ia32/ScanMem16.asm</Filename>

     <Filename SupArchList="IA32">Ia32/ScanMem32.asm</Filename>

     <Filename SupArchList="IA32">Ia32/ScanMem64.asm</Filename>

+    <Filename SupArchList="IA32">Ia32/CopyMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem16.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/SetMem64.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ZeroMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/CompareMem.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem8.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem16.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem32.S</Filename>

+    <Filename SupArchList="IA32">Ia32/ScanMem64.S</Filename>

     <Filename SupArchList="X64">MemLibGuid.c</Filename>

     <Filename SupArchList="X64">CopyMemWrapper.c</Filename>

     <Filename SupArchList="X64">SetMemWrapper.c</Filename>

diff --git a/MdePkg/MdePkg-All-Archs.fpd b/MdePkg/MdePkg-All-Archs.fpd
index 837771b196..bf2ddb09e6 100644
--- a/MdePkg/MdePkg-All-Archs.fpd
+++ b/MdePkg/MdePkg-All-Archs.fpd
@@ -2616,7 +2616,7 @@
         "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}"

       </Option>

       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>

-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>

+      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-x assembler-with-cpp", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>

 

       <!-- BOB tool chain options definition : IA32 -->

       <Option TagName="BOB" SupArchList="IA32" ToolCode="CC">

diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index 0635b3144d..5147b6cfaa 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -843,7 +843,7 @@
         "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols", "--entry ${ENTRYPOINT}"

       </Option>


       <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="ASMLINK"/>


-      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>


+      <Option ToolChainFamily="GCC" SupArchList="IA32" ToolCode="PP"> "-E", "-x assembler-with-cpp", "-include ${DEST_DIR_DEBUG}/AutoGen.h" </Option>


 


     </Options>