From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 3 Oct 2013 21:55:06 +0000 (+0200)
Subject: 	* grub-core/kern/arm/dl.c (do_relocations): Accept and ignore
X-Git-Tag: grub-2.02-beta1~777
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7c177f07fc60860fb561c42bcc5a7dffdbd68da;p=thirdparty%2Fgrub.git

	* grub-core/kern/arm/dl.c (do_relocations): Accept and ignore
	R_ARM_V4BX.
---

diff --git a/ChangeLog b/ChangeLog
index 194366d0d..e54b76c59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/arm/dl.c (do_relocations): Accept and ignore
+	R_ARM_V4BX.
+
 2013-10-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/tests/video_checksum.c: Increase robustness to out of memory
diff --git a/grub-core/kern/arm/dl.c b/grub-core/kern/arm/dl.c
index 4d7f34b2b..4563a52f9 100644
--- a/grub-core/kern/arm/dl.c
+++ b/grub-core/kern/arm/dl.c
@@ -90,6 +90,11 @@ do_relocations (Elf_Shdr * relhdr, Elf_Ehdr * e, grub_dl_t mod)
 	      return retval;
 	  }
 	  break;
+	  /* Happens when compiled with -march=armv4.  Since currently we need
+	     at least armv5, keep bx as-is.
+	   */
+	case R_ARM_V4BX:
+	  break;
 	case R_ARM_THM_JUMP19:
 	  {
 	    /* Thumb instructions can be 16-bit aligned */