From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 13 May 2011 13:17:02 +0000 (+0200)
Subject: 	* grub-core/kern/mips/dl.c (grub_arch_dl_relocate_symbols): Handle
X-Git-Tag: 1.99~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b44fecaa65643896bfd95fc76a5a782b802e416;p=thirdparty%2Fgrub.git

	* 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 d36d3441f..944fcb4ab 100644
--- 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 485955e7f..e17e9f30b 100644
--- 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);