UnixPkg: Enable gasket functions for all X64 toolchains

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

1 files changed, 316 insertions, 316 deletions

diff --git a/UnixPkg/Sec/X64/MangleGasket.S b/UnixPkg/Sec/X64/MangleGasket.S
index f29b1e314d..383a8830da 100644
--- a/UnixPkg/Sec/X64/MangleGasket.S
+++ b/UnixPkg/Sec/X64/MangleGasket.S
@@ -2,14 +2,14 @@
 #
 # This template was generated from GasketEfiTemplate.c Unix x86_64 ABI
 #
-# The EFI_UNIX_THUNK_PROTOCOL member functions call these these generic assembly 
-# routines.  
+# The EFI_UNIX_THUNK_PROTOCOL member functions call these these generic assembly
+# routines.
 #
 # Some OS X POSIX calls get name mangled in C code and we need to fill in a C global
 # to get the correct binding (does not work from assembly). So we have 4 functions
 # that do an indirect call, while the others call POSIX APIs directly
 #
-# movq	_gUnixRmDir@GOTPCREL(%rip), %rax 
+# movq	_gUnixRmDir@GOTPCREL(%rip), %rax
 #
 #
 # UNIX Arg passing: RCX, RDX,  R8,  R9
@@ -38,719 +38,719 @@
 
 // 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte boundry
 // Any call with 0 - 4 arguments allocates 40 bytes on the stack.
-// For more than 4 args you always have to increase in quanta of 16 so 5 or 6 args is 56, 
+// For more than 4 args you always have to increase in quanta of 16 so 5 or 6 args is 56,
 // 7 or 8 args is 72, and 9 or 10 args is 88
-#define EFI_STACK_SHADOW_SPACE          40  
-#define EFI_STACK_SHADOW_SPACE_5_6      56  
-#define EFI_STACK_SHADOW_SPACE_7_8      72 
-#define EFI_STACK_SHADOW_SPACE_9_10     88 
+#define EFI_STACK_SHADOW_SPACE          40
+#define EFI_STACK_SHADOW_SPACE_5_6      56
+#define EFI_STACK_SHADOW_SPACE_7_8      72
+#define EFI_STACK_SHADOW_SPACE_9_10     88
 
 
 
 	.text
 
 
-.globl _Gasketrmdir
-_Gasketrmdir:
+ASM_GLOBAL ASM_PFX(Gasketrmdir)
+ASM_PFX(Gasketrmdir):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
 
-	movq	_gUnixRmDir@GOTPCREL(%rip), %rax  // Get function name mangled by C
+	movq	ASM_PFX(gUnixRmDir)@GOTPCREL(%rip), %rax  // Get function name mangled by C
 	movq	(%rax), %rax
 	call	*%rax
-    
+
 	pushq	  %rdi          // restore state
 	pushq	  %rsi
 	ret
 
 
-.globl _Gasketopendir
-_Gasketopendir:
+ASM_GLOBAL ASM_PFX(Gasketopendir)
+ASM_PFX(Gasketopendir):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
 
-	movq	_gUnixOpenDir@GOTPCREL(%rip), %rax  // Get function name mangled by C
+	movq	ASM_PFX(gUnixOpenDir)@GOTPCREL(%rip), %rax  // Get function name mangled by C
 	movq	(%rax), %rax
 	call	*%rax
-	
+
 	popq  %rdi             // restore state
 	popq  %rsi
   ret
 
 
 
-.globl _Gasketstat
-_Gasketstat:
+ASM_GLOBAL ASM_PFX(Gasketstat)
+ASM_PFX(Gasketstat):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
 
-	movq	_gUnixStat@GOTPCREL(%rip), %rax   // Get function name mangled by C
+	movq	ASM_PFX(gUnixStat)@GOTPCREL(%rip), %rax   // Get function name mangled by C
 	movq	(%rax), %rax
 	call	*%rax
-	
+
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
-	
-	
-.globl _Gasketstatfs
-_Gasketstatfs:
+
+
+ASM_GLOBAL ASM_PFX(Gasketstatfs)
+ASM_PFX(Gasketstatfs):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
 
-	movq	_gUnixStatFs@GOTPCREL(%rip), %rax   // Get function name mangled by C
+	movq	ASM_PFX(gUnixStatFs)@GOTPCREL(%rip), %rax   // Get function name mangled by C
 	movq	(%rax), %rax
 	call	*%rax
-	
+
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
-	
-.globl _Gasketrewinddir
-_Gasketrewinddir:
+
+ASM_GLOBAL ASM_PFX(Gasketrewinddir)
+ASM_PFX(Gasketrewinddir):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
 
-	movq	_gUnixRewinddir@GOTPCREL(%rip), %rax   // Get function name mangled by C
+	movq	ASM_PFX(gUnixRewinddir)@GOTPCREL(%rip), %rax   // Get function name mangled by C
 	movq	(%rax), %rax
 	call	*%rax
-	
+
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
-	
-.globl _Gasketreaddir
-_Gasketreaddir:
+
+ASM_GLOBAL ASM_PFX(Gasketreaddir)
+ASM_PFX(Gasketreaddir):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
 
-	movq	_gUnixReaddir@GOTPCREL(%rip), %rax   // Get function name mangled by C
+	movq	ASM_PFX(gUnixReaddir)@GOTPCREL(%rip), %rax   // Get function name mangled by C
 	movq	(%rax), %rax
 	call	*%rax
-	
+
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
-	
 
-.globl _GasketmsSleep
-_GasketmsSleep:
+
+ASM_GLOBAL ASM_PFX(GasketmsSleep)
+ASM_PFX(GasketmsSleep):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	ASM_PFX(msSleep)
 
-	call	_msSleep
-	
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
-	
-	
-.globl _Gasketexit
-_Gasketexit:
-  movq    %rcx, %rdi    // Swizzle args 
-	call	_exit           // Less to do as we will never return to EFI ABI world
+
+
+ASM_GLOBAL ASM_PFX(Gasketexit)
+ASM_PFX(Gasketexit):
+  movq    %rcx, %rdi    // Swizzle args
+	call	ASM_PFX(exit)           // Less to do as we will never return to EFI ABI world
 LDEAD_LOOP:
   jmp  LDEAD_LOOP       // _exit should never return
 
 
 
-.globl _GasketSetTimer
-_GasketSetTimer:
+ASM_GLOBAL ASM_PFX(GasketSetTimer)
+ASM_PFX(GasketSetTimer):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	ASM_PFX(SetTimer)
 
-	call	_SetTimer
-	
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
 
-	
-.globl _GasketGetLocalTime
-_GasketGetLocalTime:
+
+ASM_GLOBAL ASM_PFX(GasketGetLocalTime)
+ASM_PFX(GasketGetLocalTime):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	ASM_PFX(GetLocalTime)
 
-	call	_GetLocalTime
-	
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
 
-	
 
-.globl _Gasketgmtime
-_Gasketgmtime:
+
+ASM_GLOBAL ASM_PFX(Gasketgmtime)
+ASM_PFX(Gasketgmtime):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	ASM_PFX(localtime)
 
-	call	_localtime
-	
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
 
 
 
-.globl _GasketGetTimeZone
-_GasketGetTimeZone:
+ASM_GLOBAL ASM_PFX(GasketGetTimeZone)
+ASM_PFX(GasketGetTimeZone):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-	call	_GetTimeZone
-	
+	call	ASM_PFX(GetTimeZone)
+
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
 
-	
-.globl _GasketGetDayLight
-_GasketGetDayLight:
+
+ASM_GLOBAL ASM_PFX(GasketGetDayLight)
+ASM_PFX(GasketGetDayLight):
 LFB26:
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-	call	_GetDayLight
-	
+	call	ASM_PFX(GetDayLight)
+
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
 
 
-.globl _Gasketpoll
-_Gasketpoll:
+ASM_GLOBAL ASM_PFX(Gasketpoll)
+ASM_PFX(Gasketpoll):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _poll
-	
+	call	  ASM_PFX(poll)
+
 	popq  %rdi            // restore state
 	popq  %rsi
   ret
 
 
 
-.globl _Gasketread
-_Gasketread:
+ASM_GLOBAL ASM_PFX(Gasketread)
+ASM_PFX(Gasketread):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _read
-	
+	call	  ASM_PFX(read)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketwrite
-_Gasketwrite:
+ASM_GLOBAL ASM_PFX(Gasketwrite)
+ASM_PFX(Gasketwrite):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _write
-	
+	call	  ASM_PFX(write)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketgetenv
-_Gasketgetenv:
+ASM_GLOBAL ASM_PFX(Gasketgetenv)
+ASM_PFX(Gasketgetenv):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	  ASM_PFX(getenv)
 
-	call	  _getenv
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketopen
-_Gasketopen:
+ASM_GLOBAL ASM_PFX(Gasketopen)
+ASM_PFX(Gasketopen):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _open
-	
+	call	  ASM_PFX(open)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketlseek
-_Gasketlseek:
+ASM_GLOBAL ASM_PFX(Gasketlseek)
+ASM_PFX(Gasketlseek):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _lseek
-	
+	call	  ASM_PFX(lseek)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketftruncate
-_Gasketftruncate:
+ASM_GLOBAL ASM_PFX(Gasketftruncate)
+ASM_PFX(Gasketftruncate):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _ftruncate
-	
+	call	  ASM_PFX(ftruncate)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketclose
-_Gasketclose:
+ASM_GLOBAL ASM_PFX(Gasketclose)
+ASM_PFX(Gasketclose):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	  ASM_PFX(close)
 
-	call	  _close
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
 
-.globl _Gasketmkdir
-_Gasketmkdir:
+ASM_GLOBAL ASM_PFX(Gasketmkdir)
+ASM_PFX(Gasketmkdir):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(mkdir)
 
-	call	  _mkdir
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketunlink
-_Gasketunlink:
+ASM_GLOBAL ASM_PFX(Gasketunlink)
+ASM_PFX(Gasketunlink):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	  ASM_PFX(unlink)
 
-	call	  _unlink
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketGetErrno
-_GasketGetErrno:
+ASM_GLOBAL ASM_PFX(GasketGetErrno)
+ASM_PFX(GasketGetErrno):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-	call	_GetErrno
-	
+	call	ASM_PFX(GetErrno)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
-.globl _Gasketclosedir
-_Gasketclosedir:
+ASM_GLOBAL ASM_PFX(Gasketclosedir)
+ASM_PFX(Gasketclosedir):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	  ASM_PFX(closedir)
 
-	call	  _closedir
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketrename
-_Gasketrename:
+ASM_GLOBAL ASM_PFX(Gasketrename)
+ASM_PFX(Gasketrename):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(rename)
 
-	call	  _rename
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketmktime
-_Gasketmktime:
+ASM_GLOBAL ASM_PFX(Gasketmktime)
+ASM_PFX(Gasketmktime):
 LFB42:
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(mktime)
 
-	call	  _mktime
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketfsync
-_Gasketfsync:
+ASM_GLOBAL ASM_PFX(Gasketfsync)
+ASM_PFX(Gasketfsync):
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(fsync)
 
-	call	  _fsync
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketchmod
-_Gasketchmod:
+ASM_GLOBAL ASM_PFX(Gasketchmod)
+ASM_PFX(Gasketchmod):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(chmod)
 
-	call	  _chmod
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketutime
-_Gasketutime:
+ASM_GLOBAL ASM_PFX(Gasketutime)
+ASM_PFX(Gasketutime):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(utime)
 
-	call	  _utime
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gaskettcflush
-_Gaskettcflush:
+ASM_GLOBAL ASM_PFX(Gaskettcflush)
+ASM_PFX(Gaskettcflush):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(tcflush)
 
-	call	  _tcflush
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketUgaCreate
-_GasketUgaCreate:
+ASM_GLOBAL ASM_PFX(GasketUgaCreate)
+ASM_PFX(GasketUgaCreate):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(UgaCreate)
 
-	call	  _UgaCreate
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketperror
-_Gasketperror:
+ASM_GLOBAL ASM_PFX(Gasketperror)
+ASM_PFX(Gasketperror):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(perror)
 
-	call	  _perror
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketioctl
-_Gasketioctl:
+ASM_GLOBAL ASM_PFX(Gasketioctl)
+ASM_PFX(Gasketioctl):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _UnixIoCtl1
-	
+	call	  ASM_PFX(UnixIoCtl1)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gasketfcntl
-_Gasketfcntl:
+ASM_GLOBAL ASM_PFX(Gasketfcntl)
+ASM_PFX(Gasketfcntl):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _UnixFcntl1
-	
+	call	  ASM_PFX(UnixFcntl1)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
 
-.globl _Gasketcfsetispeed
-_Gasketcfsetispeed:
+ASM_GLOBAL ASM_PFX(Gasketcfsetispeed)
+ASM_PFX(Gasketcfsetispeed):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(cfsetispeed)
 
-	call	  _cfsetispeed
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
 
-.globl _Gasketcfsetospeed
-_Gasketcfsetospeed:
+ASM_GLOBAL ASM_PFX(Gasketcfsetospeed)
+ASM_PFX(Gasketcfsetospeed):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(cfsetospeed)
 
-	call	  _cfsetospeed
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gaskettcgetattr
-_Gaskettcgetattr:
+ASM_GLOBAL ASM_PFX(Gaskettcgetattr)
+ASM_PFX(Gaskettcgetattr):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _tcgetattr
-	
+	call	  ASM_PFX(tcgetattr)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _Gaskettcsetattr
-_Gaskettcsetattr:
+ASM_GLOBAL ASM_PFX(Gaskettcsetattr)
+ASM_PFX(Gaskettcsetattr):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _tcsetattr
-	
+	call	  ASM_PFX(tcsetattr)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketUnixPeCoffGetEntryPoint
-_GasketUnixPeCoffGetEntryPoint:
+ASM_GLOBAL ASM_PFX(GasketUnixPeCoffGetEntryPoint)
+ASM_PFX(GasketUnixPeCoffGetEntryPoint):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(SecPeCoffGetEntryPoint)
 
-	call	  _SecPeCoffGetEntryPoint
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
 
-.globl _GasketUnixPeCoffRelocateImageExtraAction
-_GasketUnixPeCoffRelocateImageExtraAction:
+ASM_GLOBAL ASM_PFX(GasketUnixPeCoffRelocateImageExtraAction)
+ASM_PFX(GasketUnixPeCoffRelocateImageExtraAction):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	  ASM_PFX(SecPeCoffRelocateImageExtraAction)
 
-	call	  _SecPeCoffRelocateImageExtraAction
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketUnixPeCoffUnloadImageExtraAction
-_GasketUnixPeCoffUnloadImageExtraAction:
+ASM_GLOBAL ASM_PFX(GasketUnixPeCoffUnloadImageExtraAction)
+ASM_PFX(GasketUnixPeCoffUnloadImageExtraAction):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	  ASM_PFX(SecPeCoffLoaderUnloadImageExtraAction)
 
-	call	  _SecPeCoffLoaderUnloadImageExtraAction
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketUgaClose
-_GasketUgaClose:
+ASM_GLOBAL ASM_PFX(GasketUgaClose)
+ASM_PFX(GasketUgaClose):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	  ASM_PFX(UgaClose)
 
-	call	  _UgaClose
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketUgaSize
-_GasketUgaSize:
+ASM_GLOBAL ASM_PFX(GasketUgaSize)
+ASM_PFX(GasketUgaSize):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _UgaSize
-	
+	call	  ASM_PFX(UgaSize)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketUgaCheckKey
-_GasketUgaCheckKey:
+ASM_GLOBAL ASM_PFX(GasketUgaCheckKey)
+ASM_PFX(GasketUgaCheckKey):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
+  movq    %rcx, %rdi    // Swizzle args
+
+	call	  ASM_PFX(UgaCheckKey)
 
-	call	  _UgaCheckKey
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketUgaGetKey
-_GasketUgaGetKey:
+ASM_GLOBAL ASM_PFX(GasketUgaGetKey)
+ASM_PFX(GasketUgaGetKey):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
+
+	call	  ASM_PFX(UgaGetKey)
 
-	call	  _UgaGetKey
-	
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketUgaBlt
-_GasketUgaBlt:
+ASM_GLOBAL ASM_PFX(GasketUgaBlt)
+ASM_PFX(GasketUgaBlt):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
   movq    %r9,  %rcx
 
-	call	  _UgaBlt
-	
+	call	  ASM_PFX(UgaBlt)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
@@ -766,10 +766,10 @@ _GasketUgaBlt:
 //   UINTN Arg2,
 //   UINTN Arg3
 //   );
-.globl _ReverseGasketUint64
-_ReverseGasketUint64:
-  movq    %rdi, %rax    // Swizzle args 
-  movq    %rsi, %r9     
+ASM_GLOBAL ASM_PFX(ReverseGasketUint64)
+ASM_PFX(ReverseGasketUint64):
+  movq    %rdi, %rax    // Swizzle args
+  movq    %rsi, %r9
 //  movq    %rdx, %rdx
   movq    %rcx, %r8
   movq    %r9,  %rcx
@@ -779,86 +779,86 @@ _ReverseGasketUint64:
   addq  $40, %rsp
 
 	ret
-	
+
 
 // Sec PPI Callbacks
 
-.globl _GasketSecUnixPeiLoadFile
-_GasketSecUnixPeiLoadFile:
+ASM_GLOBAL ASM_PFX(GasketSecUnixPeiLoadFile)
+ASM_PFX(GasketSecUnixPeiLoadFile):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
   movq    %r9,  %rcx
 
-	call	  _SecUnixPeiLoadFile
-	
+	call	  ASM_PFX(SecUnixPeiLoadFile)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
 
-.globl _GasketSecUnixPeiAutoScan
-_GasketSecUnixPeiAutoScan:
+ASM_GLOBAL ASM_PFX(GasketSecUnixPeiAutoScan)
+ASM_PFX(GasketSecUnixPeiAutoScan):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
 
-	call	  _SecUnixPeiAutoScan
-	
+	call	  ASM_PFX(SecUnixPeiAutoScan)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
-.globl _GasketSecUnixUnixThunkAddress
-_GasketSecUnixUnixThunkAddress:
+ASM_GLOBAL ASM_PFX(GasketSecUnixUnixThunkAddress)
+ASM_PFX(GasketSecUnixUnixThunkAddress):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-	call	  _SecUnixUnixThunkAddress
-	
+	call	  ASM_PFX(SecUnixUnixThunkAddress)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketSecPeiReportStatusCode
-_GasketSecPeiReportStatusCode:
+ASM_GLOBAL ASM_PFX(GasketSecPeiReportStatusCode)
+ASM_PFX(GasketSecPeiReportStatusCode):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
   movq    %r9,  %rcx
   movq    $0,   %r8     // BugBug: This should come from the stack
   movq    $0,   %r9     //         But we can cheat since they are optional for bringup....
 
-	call	  _SecPeiReportStatusCode
-	
+	call	  ASM_PFX(SecPeiReportStatusCode)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
 
 
-.globl _GasketSecUnixFdAddress
-_GasketSecUnixFdAddress:
+ASM_GLOBAL ASM_PFX(GasketSecUnixFdAddress)
+ASM_PFX(GasketSecUnixFdAddress):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
   movq    %r9,  %rcx
 
-	call	  _SecUnixFdAddress
-	
+	call	  ASM_PFX(SecUnixFdAddress)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret
@@ -866,18 +866,18 @@ _GasketSecUnixFdAddress:
 
 
 
-.globl _GasketSecTemporaryRamSupport
-_GasketSecTemporaryRamSupport:
+ASM_GLOBAL ASM_PFX(GasketSecTemporaryRamSupport)
+ASM_PFX(GasketSecTemporaryRamSupport):
 	pushq	  %rsi          // %rsi & %rdi are volatie in Unix and callee-save in EFI ABI
 	pushq	  %rdi
 
-  movq    %rcx, %rdi    // Swizzle args 
-  movq    %rdx, %rsi     
+  movq    %rcx, %rdi    // Swizzle args
+  movq    %rdx, %rsi
   movq    %r8,  %rdx
   movq    %r9,  %rcx
 
-	call	  _SecTemporaryRamSupport
-	
+	call	  ASM_PFX(SecTemporaryRamSupport)
+
 	popq    %rdi          // restore state
 	popq    %rsi
   ret