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

	R_ARM_V4BX.

diff --git a/ChangeLog b/ChangeLog
index 194366d0dc96a5e861dfd1c5d1f53cff33d96f69..e54b76c593f0d502331f37cbb14f25775d85d6cd 100644 (file)
--- 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 4d7f34b2b081fe6c946c5ab392a0ec54dd08f496..4563a52f997b1e40fa2d4ee6b10c1769770dce14 100644 (file)
--- 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 */