Use same scheme as *.asm file.

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

diff --git a/ArmRealViewEbPkg/SecForPei/Arm/ModuleEntryPoint.S b/ArmRealViewEbPkg/SecForPei/Arm/ModuleEntryPoint.S
index 385dd334bb8d1e8c626aabb3720fec583697c481..57fea68c655393c443cfdb60782232c4df2f5f08 100755 (executable)
--- a/ArmRealViewEbPkg/SecForPei/Arm/ModuleEntryPoint.S
+++ b/ArmRealViewEbPkg/SecForPei/Arm/ModuleEntryPoint.S
@@ -31,8 +31,7 @@
 .globl ASM_PFX(StartupAddr)\r
 \r
 \r
 .globl ASM_PFX(StartupAddr)\r
 \r
 \r

-ASM_PFX(CEntryPointData):\r
-  .word ASM_PFX(StartupAddr)\r
+ASM_PFX(StartupAddr):   .word ASM_PFX(CEntryPoint)\r

 \r
 ASM_PFX(_ModuleEntryPoint):\r
  \r
 \r
 ASM_PFX(_ModuleEntryPoint):\r
  \r


@@ -67,8 +66,7 @@ ASM_PFX(_ModuleEntryPoint):
  \r
   // move sec startup address into a data register\r
   // ensure we're jumping to FV version of the code (not boot remapped alias)\r
  \r
   // move sec startup address into a data register\r
   // ensure we're jumping to FV version of the code (not boot remapped alias)\r

-  ldr   r5, ASM_PFX(CEntryPointData) // Extra level of indirection fixes Xcode relocation issue\r
-  ldr   r4, [r5]\r
+  ldr   r4, ASM_PFX(StartupAddr) // Extra level of indirection fixes Xcode relocation issue\r

 \r
   // jump to SEC C code\r
   blx   r4\r
 \r
   // jump to SEC C code\r
   blx   r4\r