ArmPkg/ArmCpuLib: Fix GCC/XCode builds

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

diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.S b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.S
index b3e0597ddda2807a8f0864853020598fbf87e29d..feeefcdd44bd927606c6e3eb55100b02cc9e8637 100644 (file)
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.S
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.S
@@ -34,7 +34,11 @@ ASM_PFX(ArmCpuSynchronizeWait):
   cmp   r0, #ARM_CPU_EVENT_BOOT_MEM_INIT\r
   // The SCU enabled is the event to tell us the Init Boot Memory is initialized\r
   beq   ArmWaitGicDistributorEnabled\r
-  bx    ASM_PFX(CArmCpuSynchronizeWait)\r
+  push {r1,lr}\r
+  LoadConstantToReg (ASM_PFX(CArmCpuSynchronizeWait), r1)\r
+  blx   r1\r
+  pop  {r1,lr}\r
+  bx   lr\r
 \r
 // IN  None\r
 ArmWaitGicDistributorEnabled:\r

diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.asm b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.asm
index 7dbff1b043726dcb887b0cc980ee8f0e5976f6b0..886c00b61aab18e31ab52b9c4dc3c6984a6b6bb3 100644 (file)
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.asm
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Helper.asm
@@ -35,7 +35,13 @@ ArmCpuSynchronizeWait
   cmp   r0, #ARM_CPU_EVENT_BOOT_MEM_INIT\r
   // The SCU enabled is the event to tell us the Init Boot Memory is initialized\r
   beq   ArmWaitGicDistributorEnabled\r
-  b     CArmCpuSynchronizeWait\r
+  // Case when the stack has been set up\r
+  push {r1,lr}\r
+  LoadConstantToReg (CArmCpuSynchronizeWait, r1)\r
+  blx   r1\r
+  pop  {r1,lr}\r
+  bx   lr\r
+\r
 \r
 // IN  None\r
 ArmWaitGicDistributorEnabled\r

diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S
index a66e8e78568053976cebf1959c40e88232f926a9..c69c8d44c5d007e9fd0ead3a4472590d22d21201 100644 (file)
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.S
@@ -11,6 +11,7 @@
 //\r
 //\r
 \r
+#include <AsmMacroIoLib.h>\r
 #include <Library/ArmCpuLib.h>\r
 #include <Chipset/ArmCortexA9.h>\r
 \r
@@ -29,7 +30,12 @@ ASM_PFX(ArmCpuSynchronizeWait):
   cmp   r0, #ARM_CPU_EVENT_BOOT_MEM_INIT\r
   // The SCU enabled is the event to tell us the Init Boot Memory is initialized\r
   beq   ASM_PFX(ArmWaitScuEnabled)\r
-  b     ASM_PFX(CArmCpuSynchronizeWait)\r
+  // Case when the stack has been set up\r
+  push {r1,lr}\r
+  LoadConstantToReg (ASM_PFX(CArmCpuSynchronizeWait), r1)\r
+  blx   r1\r
+  pop  {r1,lr}\r
+  bx   lr\r
 \r
 // IN None\r
 // OUT r0 = SCU Base Address\r

diff --git a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.asm b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.asm
index d0fc2b5a8a2d57f9547e3f3a72821e087b132088..ef5015c1896d12db6f4d2895160a82fe980dbb2c 100644 (file)
--- a/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.asm
+++ b/ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Helper.asm
@@ -11,9 +11,12 @@
 //\r
 //\r
 \r
+#include <AsmMacroIoLib.h>\r
 #include <Library/ArmCpuLib.h>\r
 #include <Chipset/ArmCortexA9.h>\r
 \r
+  INCLUDE AsmMacroIoLib.inc\r
+\r
   EXPORT  ArmCpuSynchronizeWait\r
   EXPORT  ArmGetScuBaseAddress\r
   IMPORT  CArmCpuSynchronizeWait\r
@@ -29,7 +32,12 @@ ArmCpuSynchronizeWait
   cmp   r0, #ARM_CPU_EVENT_BOOT_MEM_INIT\r
   // The SCU enabled is the event to tell us the Init Boot Memory is initialized\r
   beq   ArmWaitScuEnabled\r
-  b     CArmCpuSynchronizeWait\r
+  // Case when the stack has been set up\r
+  push {r1,lr}\r
+  LoadConstantToReg (CArmCpuSynchronizeWait, r1)\r
+  blx   r1\r
+  pop  {r1,lr}\r
+  bx   lr\r
 \r
 // IN None\r
 // OUT r0 = SCU Base Address\r

diff --git a/ArmPkg/Drivers/TimerDxe/TimerDxe.c b/ArmPkg/Drivers/TimerDxe/TimerDxe.c
index 3cde15ca40aad42e0cac11e560e9149e7c39c00d..90dcec45637b59e4acf5a987cc1da11287d06de1 100644 (file)
--- a/ArmPkg/Drivers/TimerDxe/TimerDxe.c
+++ b/ArmPkg/Drivers/TimerDxe/TimerDxe.c
@@ -16,6 +16,7 @@
 
 #include <PiDxe.h>
 
+#include <Library/ArmLib.h>
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>

diff --git a/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.c b/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.c
index 80ee5aa249e94ac2cd13cf46bb78360d58a864ce..6253c0d5c7a7925cd8d930808582d58b30e88020 100644 (file)
--- a/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.c
+++ b/ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.c
@@ -22,6 +22,7 @@
 \r
 **/\r
 \r
+#include <Base.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r

diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
index 21e9edc959d3b4cf3aa2d861d1d8a9b664534f56..2388c5c015934fc151ceade70f29561adfceaa59 100644 (file)
--- a/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
+++ b/ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
@@ -37,5 +37,4 @@
   DebugLib\r
   PeCoffGetEntryPointLib\r
   ArmDisassemblerLib\r
-\r
-\r
+  SerialPortLib\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 73aff703b3b0c09fcd9637836acd3e4bba6fe16a..d2c13a9ff7f9620099f46329e10fd9e22e7dc2c1 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -68,7 +68,7 @@
 \r
   GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -mfpu=neon -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4\r
   \r
-  XCODE:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a -mfpu=neon -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4\r
+  XCODE:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -mfpu=neon -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4\r
 \r
 ################################################################################\r
 #\r