Use $t9 for indirect calls from asm to C as PIC ABI requires.

diff --git a/ChangeLog b/ChangeLog
index 6e2ceeb3e6accbabb8bd86c67e540abd52d45ea5..856185496f4e8db1a03d1a281cab4a4b20b10d92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Use $t9 for indirect calls from asm to C as PIC ABI requires.
+
 2013-11-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Remove -march=mips3 from TARGET_CCASFLAGS as it creates linking problem

diff --git a/grub-core/boot/mips/startup_raw.S b/grub-core/boot/mips/startup_raw.S
index 606197624f0dfdb18140ea884cd12b10189b08c7..9e4a7e6d9f8efff87d611ba224efff1bb75612fe 100644 (file)
--- a/grub-core/boot/mips/startup_raw.S
+++ b/grub-core/boot/mips/startup_raw.S
@@ -265,16 +265,16 @@ cmdlinedone:
        */
        move $s6, $a3
 
-       lui $t0, %hi(EXT_C(grub_decompress_core))
-       addiu $t0, $t0, %lo(EXT_C(grub_decompress_core))
+       lui $t9, %hi(EXT_C(grub_decompress_core))
+       addiu $t9, $t9, %lo(EXT_C(grub_decompress_core))
 
 #ifdef GRUB_MACHINE_ARC
        lui $sp, %hi(_start - 512)
-       jalr $t0
+       jalr $t9
         addiu $sp, $sp, %lo(_start - 512)
 #else
        lui $sp, %hi(_start - 256)
-       jalr $t0
+       jalr $t9
         addiu $sp, $sp, %lo(_start - 256)
 #endif 
        move $a0, $s1

diff --git a/grub-core/kern/mips/startup.S b/grub-core/kern/mips/startup.S
index 35a11bcf8d8bf81c45c73a33b1899118845fea29..709a91afa6840154d43c11fa4de2a8384cfcadb1 100644 (file)
--- a/grub-core/kern/mips/startup.S
+++ b/grub-core/kern/mips/startup.S
@@ -116,10 +116,10 @@ bsscont:
        bne $t3, $0, bsscont
          nop
 
-       lui $t1, %hi(grub_main)
-       addiu $t1, %lo(grub_main)
+       lui $t9, %hi(grub_main)
+       addiu $t9, %lo(grub_main)
 
        lui $sp, %hi(GRUB_MACHINE_MEMORY_STACK_HIGH)
-       jr $t1
+       jr $t9
         addiu $sp, $sp, %lo(GRUB_MACHINE_MEMORY_STACK_HIGH)