From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1VxLP3-0001EW-TW for mharc-grub-devel@gnu.org; Sun, 29 Dec 2013 13:47:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VxLOw-00011a-6a for grub-devel@gnu.org; Sun, 29 Dec 2013 13:47:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VxLOq-0008Iz-6X for grub-devel@gnu.org; Sun, 29 Dec 2013 13:47:50 -0500 Received: from benson.vm.bytemark.co.uk ([212.110.190.137]:37727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VxLOp-0008Ij-V6 for grub-devel@gnu.org; Sun, 29 Dec 2013 13:47:44 -0500 Received: from cpc22-cmbg14-2-0-cust482.5-4.cable.virginm.net ([86.6.25.227] helo=hastur.hellion.org.uk) by benson.vm.bytemark.co.uk with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1VxLOo-0000KY-6M; Sun, 29 Dec 2013 18:47:43 +0000 Received: by hastur.hellion.org.uk (sSMTP sendmail emulation); Sun, 29 Dec 2013 18:47:41 +0000 From: Ian Campbell To: grub-devel@gnu.org Subject: [PATCH 4/7] mkimage: make R_ARM_ABS32 debug output more consistent Date: Sun, 29 Dec 2013 18:47:33 +0000 Message-Id: <1388342856-18317-4-git-send-email-ijc@hellion.org.uk> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1388342839.32105.25.camel@hastur.hellion.org.uk> References: <1388342839.32105.25.camel@hastur.hellion.org.uk> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.110.190.137 Cc: Vladimir Serbinenko , Leif Lindholm , Ian Campbell X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Dec 2013 18:47:56 -0000 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 --- 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