ArmPkg/ArmCpuLib: Fix GCC/XCode builds

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12626 6f19259b-4bc3-4df7-8a09-765794883524
2011-11-01 23:32:04 +00:00
parent 793275a858
commit 81be6e070f
8 changed files with 32 additions and 7 deletions
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.asm
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.asm
@@ -11,9 +11,12 @@
 //
 //

+#include <AsmMacroIoLib.h>
 #include <Library/ArmCpuLib.h>
 #include <Chipset/ArmCortexA9.h>

+  INCLUDE AsmMacroIoLib.inc
+
  EXPORT  ArmCpuSynchronizeWait
  EXPORT  ArmGetScuBaseAddress
  IMPORT  CArmCpuSynchronizeWait
@@ -29,7 +32,12 @@ 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
+  // Case when the stack has been set up
+  push	{r1,lr}
+  LoadConstantToReg (CArmCpuSynchronizeWait, r1)
+  blx   r1
+  pop	{r1,lr}
+  bx	lr

 // IN None
 // OUT r0 = SCU Base Address