* util/grub-mkimagexx.c (relocate_addresses): Display offset rather

	than almost useless pointer.

diff --git a/ChangeLog b/ChangeLog
index f27d3048215a0da3ae5a723eefbf16cb56f22edb..db0f37883b3d353cc3570e64786743c390ae9390 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-mkimagexx.c (relocate_addresses): Display offset rather
+       than almost useless pointer.
+
 2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Add gcc_struct to all packed structures when compiling with mingw.

diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index b7c01ab1a61658d2aec75b379153937161465991..d6feffd2a1541be43970a9c187d88711bc5de05e 100644 (file)
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -855,7 +855,10 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
                   case R_ARM_THM_JUMP19:
                     {
                       grub_err_t err;
-                      grub_util_info ("  THM_JUMP24:\ttarget=0x%08lx\toffset=(0x%08x)",        (unsigned long) target, sym_addr);
+                      grub_util_info ("  THM_JUMP24:\ttarget=0x%08lx\toffset=(0x%08x)",
+                                      (unsigned long) ((char *) target
+                                                       - (char *) e),
+                                      sym_addr);
                       if (!(sym_addr & 1))
                         {
                           grub_uint32_t tr_addr;
@@ -888,7 +891,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
                   case R_ARM_JUMP24:
                     {
                       grub_err_t err;
-                      grub_util_info ("  JUMP24:\ttarget=0x%08lx\toffset=(0x%08x)",    (unsigned long) target, sym_addr);
+                      grub_util_info ("  JUMP24:\ttarget=0x%08lx\toffset=(0x%08x)",  (unsigned long) ((char *) target - (char *) e), sym_addr);
                       if (sym_addr & 1)
                         {
                           grub_uint32_t tr_addr;