From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 13 May 2011 13:20:16 +0000 (+0200)
Subject: 	* grub-core/boot/mips/startup_raw.S: Use jalr rather than bal to call
X-Git-Tag: 1.99~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a298aa046c528b8c4a5a73fb5dd92d24bdd453f6;p=thirdparty%2Fgrub.git

	* grub-core/boot/mips/startup_raw.S: Use jalr rather than bal to call
	grub_decompress_core since later would fail if grub_decompress_core
	is too far.
---

diff --git a/ChangeLog b/ChangeLog
index 944fcb4ab..d1a1d6f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/boot/mips/startup_raw.S: Use jalr rather than bal to call
+	grub_decompress_core since later would fail if grub_decompress_core
+	is too far.
+
 2011-05-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/mips/dl.c (grub_arch_dl_relocate_symbols): Handle
diff --git a/grub-core/boot/mips/startup_raw.S b/grub-core/boot/mips/startup_raw.S
index c41ce8257..2e874e251 100644
--- a/grub-core/boot/mips/startup_raw.S
+++ b/grub-core/boot/mips/startup_raw.S
@@ -170,9 +170,11 @@ argdone:
 	*/
 	move $s6, $a3
 
-	lui $sp, %hi(_start - 256)
+	lui $t0, %hi(EXT_C(grub_decompress_core))
+	addiu $t0, $t0, %lo(EXT_C(grub_decompress_core))
 
-	bal EXT_C(grub_decompress_core)
+	lui $sp, %hi(_start - 256)
+	jalr $t0
 	 addiu $sp, $sp, %lo(_start - 256)
 	
 	move $a0, $s1