From f85cd4220b5f3e478edd3f2f95bf562a3c46e2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 2 Nov 2010 22:07:27 +0000 Subject: [PATCH] ppc: Use vector-local version of exception_return MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On ppc64 the high 32 address bits are clear, so ba's sign extension cannot be used to branch to the ROM version of exception_return. Use a relative branch to the relocated version instead. This fixes relocation linker errors for ppc64. Signed-off-by: Andreas Färber Acked-by: Alexander Graf git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@942 f158a5a8-5612-0410-a976-696ce0be7e32 --- arch/ppc/qemu/start.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/start.S b/arch/ppc/qemu/start.S index 27168ad..3ee59d7 100644 --- a/arch/ppc/qemu/start.S +++ b/arch/ppc/qemu/start.S @@ -206,7 +206,7 @@ VECTOR( 0x300, "DSI" ): addi r3,r3,LO(dsi_exception) mtctr r3 bctrl - ba exception_return + b exception_return VECTOR( 0x400, "ISI" ): EXCEPTION_PREAMBLE @@ -214,7 +214,7 @@ VECTOR( 0x400, "ISI" ): addi r3,r3,LO(isi_exception) mtctr r3 bctrl - ba exception_return + b exception_return ILLEGAL_VECTOR( 0x500 ) ILLEGAL_VECTOR( 0x600 )