From: Ian Campbell <ijc@hellion.org.uk>
To: grub-devel@gnu.org
Cc: Vladimir Serbinenko <phcoder@gmail.com>,
Leif Lindholm <leif.lindholm@linaro.org>,
Ian Campbell <ijc@hellion.org.uk>
Subject: [PATCH 4/7] mkimage: make R_ARM_ABS32 debug output more consistent
Date: Sun, 29 Dec 2013 18:47:33 +0000 [thread overview]
Message-ID: <1388342856-18317-4-git-send-email-ijc@hellion.org.uk> (raw)
In-Reply-To: <1388342839.32105.25.camel@hastur.hellion.org.uk>
The decimal target is not very useful and all the other arm reloc debugging
prints a hex target and offset, so do the same.
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
---
util/grub-mkimagexx.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index 399ff6a..759e838 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -865,8 +865,10 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
{
case R_ARM_ABS32:
{
- grub_util_info (" ABS32:\toffset=%d\t(0x%08x)",
- (int) sym_addr, (int) sym_addr);
+ grub_util_info (" ABS32:\ttarget=0x%08lx\toffset=(0x%08x)",
+ (unsigned long) ((char *) target
+ - (char *) e),
+ sym_addr);
/* Data will be naturally aligned */
sym_addr += image_target->vaddr_offset;
*target = grub_host_to_target32 (grub_target_to_host32 (*target) + sym_addr);
--
1.8.4.rc3
next prev parent reply other threads:[~2013-12-29 18:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-29 18:47 [PATCH 0/7] arm-uboot: support for different RAM bases Ian Campbell
2013-12-29 18:47 ` [PATCH 1/7] mkimage: Refactor IMAGE_EFI checks into a function grub_image_needs_reloc Ian Campbell
2013-12-29 18:47 ` [PATCH 2/7] mkimage: Replace hardcoded 0x400 in R_ARM_ABS32 relocation Ian Campbell
2013-12-29 18:47 ` [PATCH 3/7] mkimage: account for space for trampolines earlier Ian Campbell
2013-12-29 18:47 ` Ian Campbell [this message]
2013-12-29 18:47 ` [PATCH 5/7] mkimage: allow linking at address 0 Ian Campbell
2013-12-29 18:47 ` [PATCH 6/7] mkimage: support images which require full relocation at mkimage time Ian Campbell
2013-12-29 22:53 ` Leif Lindholm
2013-12-30 3:49 ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-12-30 10:54 ` Ian Campbell
2013-12-30 15:46 ` Andrey Borzenkov
2013-12-31 14:19 ` Francesco Lavra
2013-12-31 16:44 ` Ian Campbell
2013-12-29 18:47 ` [PATCH 7/7] arm-uboot: support relocation at installation time Ian Campbell
2013-12-29 19:10 ` [PATCH 0/7] arm-uboot: support for different RAM bases Ian Campbell
2013-12-29 23:04 ` Leif Lindholm
2013-12-30 1:55 ` Vladimir 'φ-coder/phcoder' Serbinenko
2013-12-30 10:48 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1388342856-18317-4-git-send-email-ijc@hellion.org.uk \
--to=ijc@hellion.org.uk \
--cc=grub-devel@gnu.org \
--cc=leif.lindholm@linaro.org \
--cc=phcoder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).