ARM Packages: Include 'AsmMacroIoLibV8.h' instead of the 32bit version

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15256 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S
index aee3dc1183f6441097a1d6c63a23db2ff9abc1b9..8fd4194ab2bcb5d56741910f2a4d648312582326 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S
+++ b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------\r
 #\r
 # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-# Copyright (c) 2011 - 2013, ARM Limited. All rights reserved.\r
+# Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -13,7 +13,7 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-#include <AsmMacroIoLib.h>\r
+#include <AsmMacroIoLibV8.h>\r
 \r
 .text\r
 .align 3\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S
index 8d2bde2f81ef6a5cb2266c58bc8d9332109d988a..24ff2fc3d0f058685c1f0844694198ceffaf09a4 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S
@@ -1,5 +1,5 @@
 //\r
-//  Copyright (c) 2013, ARM Limited. All rights reserved.\r
+//  Copyright (c) 2013-2014, ARM Limited. All rights reserved.\r
 //\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
@@ -11,7 +11,7 @@
 //\r
 //\r
 \r
-#include <AsmMacroIoLib.h>\r
+#include <AsmMacroIoLibV8.h>\r
 \r
 // Register definitions used by GCC for GICv3 access.\r
 // These are defined by ARMCC, so keep them in the GCC specific code for now.\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/RTSMBoot.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/RTSMBoot.S
index ded8a3162ba41539a6cf088a367596a50c1ac4d2..6c73cdad31589a6cd8bb0240634854f35cc8784e 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/RTSMBoot.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/RTSMBoot.S
@@ -1,5 +1,5 @@
 //\r
-//  Copyright (c) 2011 - 2013, ARM Limited. All rights reserved.\r
+//  Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.\r
 //\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
@@ -11,7 +11,7 @@
 //\r
 //\r
 \r
-#include <AsmMacroIoLib.h>\r
+#include <AsmMacroIoLibV8.h>\r
 #include <Base.h>\r
 #include <Library/ArmPlatformLib.h>\r
 #include <AutoGen.h>\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/RTSMFoundationBoot.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/RTSMFoundationBoot.S
index b2ebeca06775f9bf57f6d776bfd173801cb6b13f..20554a6fe72a3ce30f58fdd58d25b714914ef91a 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/RTSMFoundationBoot.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/RTSMFoundationBoot.S
@@ -1,5 +1,5 @@
 //\r
-//  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
+//  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
 //\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
@@ -11,7 +11,7 @@
 //\r
 //\r
 \r
-#include <AsmMacroIoLib.h>\r
+#include <AsmMacroIoLibV8.h>\r
 #include <Base.h>\r
 #include <Library/ArmPlatformLib.h>\r
 #include <AutoGen.h>\r

diff --git a/ArmPlatformPkg/Library/ArmPlatformStackLib/AArch64/ArmPlatformStackLib.S b/ArmPlatformPkg/Library/ArmPlatformStackLib/AArch64/ArmPlatformStackLib.S
index 337af9c6a930e0e88740ac3156b9f2f8558989a8..485017f62013987d020d6778787853a74354ba1b 100644 (file)
--- a/ArmPlatformPkg/Library/ArmPlatformStackLib/AArch64/ArmPlatformStackLib.S
+++ b/ArmPlatformPkg/Library/ArmPlatformStackLib/AArch64/ArmPlatformStackLib.S
@@ -1,5 +1,5 @@
 //\r
-//  Copyright (c) 2012-2013, ARM Limited. All rights reserved.\r
+//  Copyright (c) 2012-2014, ARM Limited. All rights reserved.\r
 //\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
@@ -11,7 +11,7 @@
 //\r
 //\r
 \r
-#include <AsmMacroIoLib.h>\r
+#include <AsmMacroIoLibV8.h>\r
 #include <Base.h>\r
 #include <AutoGen.h>\r
 \r