ArmPlatformPkg: Add missing ASM_PFX() macro in exception call back

The ASM_PFX() was missing for some calls of the common exception callback.

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

diff --git a/ArmPlatformPkg/PrePeiCore/Exception.S b/ArmPlatformPkg/PrePeiCore/Exception.S
index a7b4982c21823a8f6d23eed88c08d1ad0511085b..c2ce15657bc206e710177e712983a43163b89974 100644 (file)
--- a/ArmPlatformPkg/PrePeiCore/Exception.S
+++ b/ArmPlatformPkg/PrePeiCore/Exception.S
@@ -84,20 +84,20 @@ _DefaultReserved:
   # Switch to SVC for common stack
   cps  #0x13
   mov  r0, #5
-  blx  PeiCommonExceptionEntry
+  blx  ASM_PFX(PeiCommonExceptionEntry)
 
 _DefaultIrq:
   sub  r1, LR, #4
   # Switch to SVC for common stack
   cps  #0x13
   mov  r0, #6
-  blx  PeiCommonExceptionEntry
+  blx  ASM_PFX(PeiCommonExceptionEntry)
 
 _DefaultFiq:
   sub  r1, LR, #4
   # Switch to SVC for common stack
   cps  #0x13
   mov  r0, #7
-  blx  PeiCommonExceptionEntry
+  blx  ASM_PFX(PeiCommonExceptionEntry)
 \r
-.end\r
+  END\r

diff --git a/ArmPlatformPkg/Sec/Exception.S b/ArmPlatformPkg/Sec/Exception.S
index 4c7f780dbe3c7a02a57a22a72c98b35a56eb4c71..067e5097cf3aca61f8235973fa4226f5b359a8ae 100644 (file)
--- a/ArmPlatformPkg/Sec/Exception.S
+++ b/ArmPlatformPkg/Sec/Exception.S
@@ -84,20 +84,20 @@ _DefaultReserved:
   # Switch to SVC for common stack
   cps  #0x13
   mov  r0, #5
-  blx  SecCommonExceptionEntry
+  blx  ASM_PFX(SecCommonExceptionEntry)
 
 _DefaultIrq:
   sub  r1, LR, #4
   # Switch to SVC for common stack
   cps  #0x13
   mov  r0, #6
-  blx  SecCommonExceptionEntry
+  blx  ASM_PFX(SecCommonExceptionEntry)
 
 _DefaultFiq:
   sub  r1, LR, #4
   # Switch to SVC for common stack
   cps  #0x13
   mov  r0, #7
-  blx  SecCommonExceptionEntry
-
+  blx  ASM_PFX(SecCommonExceptionEntry)
 
+  END