Arm Packages: Fix builds for XCODE32 toolchain

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12509 6f19259b-4bc3-4df7-8a09-765794883524
2011-10-04 13:58:28 +00:00
parent 41b152c5f6
commit 89bbce116a
9 changed files with 27 additions and 12 deletions
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S
@@ -28,8 +28,8 @@ GCC_ASM_IMPORT(CArmCpuSynchronizeWait)
 ASM_PFX(ArmCpuSynchronizeWait):
  cmp   r0, #ARM_CPU_EVENT_BOOT_MEM_INIT
  // The SCU enabled is the event to tell us the Init Boot Memory is initialized
-  beq   ArmWaitScuEnabled
-  b     CArmCpuSynchronizeWait
+  beq   ASM_PFX(ArmWaitScuEnabled)
+  b     ASM_PFX(CArmCpuSynchronizeWait)

 // IN None
 // OUT r0 = SCU Base Address
@@ -48,5 +48,5 @@ ASM_PFX(ArmWaitScuEnabled):
  add   r0, r0, #A9_SCU_CONTROL_OFFSET
  ldr   r0, [r0]
  cmp   r0, #1
-  bne   ArmWaitScuEnabled
+  bne   ASM_PFX(ArmWaitScuEnabled)
  bx    lr