diff options
| author | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-03-05 13:23:47 +0000 |
|---|---|---|
| committer | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-03-05 13:23:47 +0000 |
| commit | 6377d2f12d7eeed0b9c623ed44e21bf908acad55 (patch) | |
| tree | 83a852c5d294331c565e318739851ed66427e263 /ArmPlatformPkg/Sec | |
| parent | 6ced2e11d09dac5d78ba83e561e85a2e01692578 (diff) | |
| download | edk2-6377d2f12d7eeed0b9c623ed44e21bf908acad55.tar.gz edk2-6377d2f12d7eeed0b9c623ed44e21bf908acad55.tar.bz2 edk2-6377d2f12d7eeed0b9c623ed44e21bf908acad55.zip | |
Fix minor Xcode build issues.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11348 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPlatformPkg/Sec')
| -rw-r--r-- | ArmPlatformPkg/Sec/Exception.S | 14 | ||||
| -rw-r--r-- | ArmPlatformPkg/Sec/Helper.S | 4 | ||||
| -rw-r--r-- | ArmPlatformPkg/Sec/SecEntryPoint.S | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ArmPlatformPkg/Sec/Exception.S b/ArmPlatformPkg/Sec/Exception.S index 81e2659c1b..54d6104b81 100644 --- a/ArmPlatformPkg/Sec/Exception.S +++ b/ArmPlatformPkg/Sec/Exception.S @@ -17,21 +17,21 @@ #start of the code section .text -.align 5
-
+.align 5 + # IMPORT GCC_ASM_IMPORT(SecCommonExceptionEntry) # EXPORT GCC_ASM_EXPORT(SecVectorTable) -
+ //============================================================ //Default Exception Handlers //============================================================ //FIXME: One of the EDK2 tool is broken. It does not look to respect the alignment. Even, if we specify 32-byte alignment for this file. -Dummy1: .word 0
-Dummy2: .word 0
+Dummy1: .word 0 +Dummy2: .word 0 ASM_PFX(SecVectorTable): b _DefaultResetHandler @@ -102,5 +102,5 @@ _DefaultFiq: cps #0x13 mov r0, #7 blx SecCommonExceptionEntry -
-.end
+ + diff --git a/ArmPlatformPkg/Sec/Helper.S b/ArmPlatformPkg/Sec/Helper.S index 94bd68f8bc..da3b0e033b 100644 --- a/ArmPlatformPkg/Sec/Helper.S +++ b/ArmPlatformPkg/Sec/Helper.S @@ -69,6 +69,6 @@ ASM_PFX(copy_cpsr_into_spsr): bx lr
dead:
- B dead
+ b dead
-.end
+ASM_FUNCTION_REMOVE_IF_UNREFERENCED
diff --git a/ArmPlatformPkg/Sec/SecEntryPoint.S b/ArmPlatformPkg/Sec/SecEntryPoint.S index e7d7160b87..5e6dfe45f6 100644 --- a/ArmPlatformPkg/Sec/SecEntryPoint.S +++ b/ArmPlatformPkg/Sec/SecEntryPoint.S @@ -41,8 +41,8 @@ GCC_ASM_IMPORT(SecVectorTable) GCC_ASM_IMPORT(ArmIsScuEnable) #endif -StartupAddr: .word CEntryPoint -SecVectorTableAddr: .word SecVectorTable +StartupAddr: .word ASM_PFX(CEntryPoint) +SecVectorTableAddr: .word ASM_PFX(SecVectorTable) ASM_PFX(_ModuleEntryPoint): #Set VBAR to the start of the exception vectors in Secure Mode @@ -109,4 +109,4 @@ _SetupStack: # r0 = core_id blx r3 -.end + |