edk2/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/(Ia32|X64)/*.S:

Fix to support building with GCC and ECP's EdkIIGlueLib. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5294 6f19259b-4bc3-4df7-8a09-765794883524
2008-05-26 21:59:52 +00:00 · 2008-05-26 21:59:52 +00:00 · 8ad319e5c1
parent 297c148b7a
commit 8ad319e5c1
96 changed files with 215 additions and 28 deletions
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ARShiftU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ARShiftU64.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathARShiftU64)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuBreakpoint.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuBreakpoint.S
@ -20,6 +20,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(CpuBreakpoint)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuId.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuId.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl  ASM_PFX(AsmCpuid)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuIdEx.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuIdEx.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
    .686:
    .code:

--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuPause.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuPause.S
@ -20,6 +20,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(CpuPause)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuSleep.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/CpuSleep.S
@ -20,6 +20,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(CpuSleep)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisableInterrupts.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisableInterrupts.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(DisableInterrupts)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisablePaging32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DisablePaging32.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalX86DisablePaging32)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathDivU64x32)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32Remainder.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x32Remainder.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathDivRemU64x32)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x64Remainder.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/DivU64x64Remainder.S
@ -20,6 +20,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathDivRemU64x32), ASM_PFX(InternalMathDivRemU64x64)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableDisableInterrupts.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableDisableInterrupts.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(EnableDisableInterrupts)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableInterrupts.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnableInterrupts.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(EnableInterrupts)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging32.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalX86EnablePaging32)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/EnablePaging64.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalX86EnablePaging64)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FlushCacheLine.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FlushCacheLine.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmFlushCacheLine)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxRestore.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxRestore.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalX86FxRestore)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxSave.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/FxSave.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalX86FxSave)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange32.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalSyncCompareExchange32)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedCompareExchange64.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalSyncCompareExchange64)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedDecrement.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedDecrement.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalSyncDecrement)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedIncrement.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/InterlockedIncrement.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalSyncIncrement)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Invd.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Invd.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmInvd)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LRotU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LRotU64.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathLRotU64)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LShiftU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LShiftU64.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathLShiftU64)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LongJump.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/LongJump.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalLongJump)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ModU64x32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ModU64x32.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathModU64x32)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Monitor.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Monitor.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmMonitor)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x32.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x32.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
    .386:
    .code:

--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/MultU64x64.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathMultU64x64)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Mwait.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Mwait.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmMwait)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RRotU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RRotU64.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalMathRRotU64)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RShiftU64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/RShiftU64.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
    .686:
    .code:

--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr0.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadCr0)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr2.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadCr2)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr3.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadCr3)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCr4.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadCr4)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadCs.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadCs)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr0.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadDr0)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr1.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr1.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadDr1)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr2.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadDr2)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr3.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadDr3)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr4.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadDr4)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr5.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr5.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadDr5)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr6.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr6.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadDr6)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr7.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDr7.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadDr7)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadDs.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadDs)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEflags.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEflags.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadEflags)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadEs.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadEs)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadFs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadFs.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadFs)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGdtr.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalX86ReadGdtr)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadGs.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadGs)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadIdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadIdtr.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(InternalX86ReadIdtr)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadLdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadLdtr.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadLdtr)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm0.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadMm0)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm1.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm1.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadMm1)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm2.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadMm2)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm3.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadMm3)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm4.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadMm4)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm5.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm5.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadMm5)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm6.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm6.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadMm6)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm7.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMm7.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadMm7)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMsr64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadMsr64.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadMsr64)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadPmc.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadPmc.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadPmc)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadSs.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadSs.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadSs)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTr.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadTr)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTsc.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/ReadTsc.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(AsmReadTsc)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SetJump.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SetJump.S
@ -19,6 +19,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 .globl ASM_PFX(SetJump), ASM_PFX(InternalAssertJumpBuffer)

 #------------------------------------------------------------------------------
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SwapBytes64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/SwapBytes64.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+

 #------------------------------------------------------------------------------
 # UINT64
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Thunk16.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Thunk16.S
@ -19,7 +19,7 @@
 #
 #------------------------------------------------------------------------------

-#include <Library/BaseLib.h>
+#include <EdkIIGlueBase.h>

 .globl ASM_PFX(m16Start), ASM_PFX(m16Size), ASM_PFX(mThunk16Attr), ASM_PFX(m16Gdt), ASM_PFX(m16GdtrBase), ASM_PFX(mTransition)
 .globl ASM_PFX(InternalAsmThunk16)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Wbinvd.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/Wbinvd.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr0.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr2.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr3.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteCr4.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr0.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr1.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr1.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr2.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr3.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr4.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr5.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr5.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr6.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr6.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr7.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteDr7.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINTN
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteGdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteGdtr.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteIdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteIdtr.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteLdtr.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteLdtr.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm0.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm0.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm1.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm1.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm2.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm2.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm3.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm3.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm4.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm4.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm5.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm5.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm6.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm6.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm7.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMm7.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # VOID
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMsr64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ia32/WriteMsr64.S
@ -21,6 +21,8 @@
 #
 #------------------------------------------------------------------------------

+#include <EdkIIGlueBase.h>
+
 #------------------------------------------------------------------------------
 # UINT64
 # EFIAPI
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/Thunk16.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/Thunk16.S
@ -18,35 +18,34 @@
 #   Real mode thunk
 #
 #------------------------------------------------------------------------------
+#include <EdkIIGlueBase.h>

-#include <Library/BaseLib.h>
+.globl ASM_PFX(m16Start)
+.globl ASM_PFX(m16Size)
+.globl ASM_PFX(mThunk16Attr)
+.globl ASM_PFX(m16Gdt)
+.globl ASM_PFX(m16GdtrBase)
+.globl ASM_PFX(mTransition)
+.globl ASM_PFX(InternalAsmThunk16)

-.globl ASM_PFX(m16Start)
-.globl ASM_PFX(m16Size)
-.globl ASM_PFX(mThunk16Attr)
-.globl ASM_PFX(m16Gdt)
-.globl ASM_PFX(m16GdtrBase)
-.globl ASM_PFX(mTransition)
-.globl ASM_PFX(InternalAsmThunk16)
-
-# define the structure of IA32_REGS
-.equ  _EDI, 0       #size 4
-.equ  _ESI, 4       #size 4
-.equ  _EBP, 8       #size 4
-.equ  _ESP, 12      #size 4
-.equ  _EBX, 16      #size 4
-.equ  _EDX, 20      #size 4
-.equ  _ECX, 24      #size 4
-.equ  _EAX, 28      #size 4
-.equ  _DS,  32      #size 2
-.equ  _ES,  34      #size 2
-.equ  _FS,  36      #size 2
-.equ  _GS,  38      #size 2
-.equ  _EFLAGS, 40   #size 8
-.equ  _EIP, 48      #size 4
-.equ  _CS, 52       #size 2
-.equ  _SS, 54       #size 2
-.equ  IA32_REGS_SIZE, 56
+# define the structure of IA32_REGS
+.equ  _EDI, 0       #size 4
+.equ  _ESI, 4       #size 4
+.equ  _EBP, 8       #size 4
+.equ  _ESP, 12      #size 4
+.equ  _EBX, 16      #size 4
+.equ  _EDX, 20      #size 4
+.equ  _ECX, 24      #size 4
+.equ  _EAX, 28      #size 4
+.equ  _DS,  32      #size 2
+.equ  _ES,  34      #size 2
+.equ  _FS,  36      #size 2
+.equ  _GS,  38      #size 2
+.equ  _EFLAGS, 40   #size 8
+.equ  _EIP, 48      #size 4
+.equ  _CS, 52       #size 2
+.equ  _SS, 54       #size 2
+.equ  IA32_REGS_SIZE, 56

    .data