From 7b23d0d8b9bef7a874a99003a9d3f3b5edbdb57a Mon Sep 17 00:00:00 2001 From: jljusten Date: Fri, 10 Apr 2009 20:58:04 +0000 Subject: [PATCH] Allow EbcLowLevel.S to be linked correctly with 'ELFGCC' toolchain. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8059 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/EbcDxe/X64/EbcLowLevel.S | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S b/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S index aa7024b3e0..3b86b53ab0 100644 --- a/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S +++ b/MdeModulePkg/Universal/EbcDxe/X64/EbcLowLevel.S @@ -36,8 +36,8 @@ .global _CopyMem; # VOID EbcLLCALLEXNative(UINTN FuncAddr, UINTN NewStackPointer, VOID *FramePtr) -.global _EbcLLCALLEXNative; -_EbcLLCALLEXNative: +.global ASM_PFX(EbcLLCALLEXNative); +ASM_PFX(EbcLLCALLEXNative): push %rbp push %rbx mov %rsp, %rbp @@ -51,7 +51,7 @@ _EbcLLCALLEXNative: sub %rsp, %r8 mov %rsp, %rcx sub %rsp, 0x20 - call _CopyMem + call ASM_PFX(CopyMem) add %rsp, 0x20 # Considering the worst case, load 4 potiential arguments @@ -84,8 +84,8 @@ _EbcLLCALLEXNative: # Returns: # The contents of the register in which the entry point is passed. # -.global _EbcLLGetEbcEntryPoint; -_EbcLLGetEbcEntryPoint: +.global ASM_PFX(EbcLLGetEbcEntryPoint); +ASM_PFX(EbcLLGetEbcEntryPoint): ret #/*++ @@ -107,16 +107,16 @@ _EbcLLGetEbcEntryPoint: #--*/ # UINTN EbcLLGetStackPointer() -.global _EbcLLGetStackPointer; -_EbcLLGetStackPointer: +.global ASM_PFX(EbcLLGetStackPointer); +ASM_PFX(EbcLLGetStackPointer): mov %rsp, %rax # Stack adjusted by this much when we were called, # For this function, it's 4. add $4, %rax ret -.global _EbcLLGetReturnValue; -_EbcLLGetReturnValue: +.global ASM_PFX(EbcLLGetReturnValue); +ASM_PFX(EbcLLGetReturnValue): # UINT64 EbcLLGetReturnValue(VOID); # Routine Description: # When EBC calls native, on return the VM has to stuff the return