* 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 944fcb4abee4c364448f2dae0cb3ddeee2e650af..d1a1d6f05f3e37d9d2cddf323302a6ff8df89dbc 100644 (file)
--- 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 c41ce8257925e2cdbaa6f198c562dd928e095fe4..2e874e251c3a9672c411bd28b0d87dc89a148bef 100644 (file)
--- 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