From 70309ce671a8550a44fbd190d6988cc556d1eaa5 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 23 Nov 2010 21:35:15 +0100
Subject: scripts/xldd: report appropriate load address for 32- or 64-bit

For 32-bit target systems, report 4-byte (8-xdigit) wide adresses,
and for 64-bit, report 8-byte (16-xdigit) wide adresses.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh
index 9d86a85..1ef8e97 100644
--- a/scripts/build/internals.sh
+++ b/scripts/build/internals.sh
@@ -49,6 +49,7 @@ do_finish() {
         CT_DoLog EXTRA "Installing a cross-ldd helper"
         sed -r -e 's|@@CT_VERSION@@|'"${CT_VERSION}"'|g;'   \
                -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;'     \
+               -e 's|@@CT_BITS@@|'"${CT_ARCH_BITNESS}"'|g;' \
                -e 's|@@CT_install@@|'"${install}"'|g;'      \
                -e 's|@@CT_bash@@|'"${bash}"'|g;'            \
                -e 's|@@CT_grep@@|'"${grep}"'|g;'            \
diff --git a/scripts/xldd.in b/scripts/xldd.in
index 30077ad..40a5fe7 100755
--- a/scripts/xldd.in
+++ b/scripts/xldd.in
@@ -3,8 +3,10 @@
 # NON-CONFIGURABLE STUFF!
 export LC_ALL=C
 version="@@CT_VERSION@@"
+bits="@@CT_BITS@@"
 sed="@@CT_sed@@"
 grep="@@CT_grep@@"
+
 my_name="$( basename "${0}" )"
 prefix="${0%-ldd}"
 gcc="${prefix}-gcc"
@@ -150,12 +152,11 @@ do_report_needed_found() {
         fi
     fi
 
-    # 8 to fake a 32-bit load address
     printf "%8s%s => %s (0x%0*x)%s\n"   \
            ""                           \
            "${needed}"                  \
            "${path}"                    \
-           8                            \
+           "$((bits/4))"                \
            "${loadaddr}"                \
            "${sys}"
 }
-- 
cgit v0.10.2-6-g49f6