From 6377d2f12d7eeed0b9c623ed44e21bf908acad55 Mon Sep 17 00:00:00 2001
From: andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Sat, 5 Mar 2011 13:23:47 +0000
Subject: Fix minor Xcode build issues.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11348 6f19259b-4bc3-4df7-8a09-765794883524
---
 ArmPlatformPkg/Sec/Exception.S     | 14 +++++++-------
 ArmPlatformPkg/Sec/Helper.S        |  4 ++--
 ArmPlatformPkg/Sec/SecEntryPoint.S |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'ArmPlatformPkg/Sec')

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
+
-- 
cgit v1.2.3