* grub-core/kern/mips/dl.c (grub_arch_dl_relocate_symbols): Handle

	R_MIPS_JALR since it's used by newer compiler.

diff --git a/ChangeLog b/ChangeLog
index d36d3441fcdab5a2d82683e25bb1f9e10fa76c4d..944fcb4abee4c364448f2dae0cb3ddeee2e650af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/mips/dl.c (grub_arch_dl_relocate_symbols): Handle
+       R_MIPS_JALR since it's used by newer compiler.
+
 2011-05-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub.d/10_linux.in: Correctly handle the Linux in root.

diff --git a/grub-core/kern/mips/dl.c b/grub-core/kern/mips/dl.c
index 485955e7fde449bf049f6d9523de8071fcfb26d0..e17e9f30bd4a5a984514a8d10bb29bb1e840e62f 100644 (file)
--- a/grub-core/kern/mips/dl.c
+++ b/grub-core/kern/mips/dl.c
@@ -213,6 +213,8 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
                      = sizeof (grub_uint32_t) * (gpptr - gp);
                    gpptr++;
                    break;
+                 case R_MIPS_JALR:
+                   break;
                  default:
                    {
                      grub_free (gp);