# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1290544515 -3600
# Node ID 9cdb153ff9df390ac9405233079ef62c62db3709
# Parent  78d2f99d403f7092203fc7a119ec19f9a2108afa
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 -r 78d2f99d403f -r 9cdb153ff9df scripts/build/internals.sh
--- a/scripts/build/internals.sh	Tue Nov 23 21:35:10 2010 +0100
+++ b/scripts/build/internals.sh	Tue Nov 23 21:35:15 2010 +0100
@@ -49,6 +49,7 @@
         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 -r 78d2f99d403f -r 9cdb153ff9df scripts/xldd.in
--- a/scripts/xldd.in	Tue Nov 23 21:35:10 2010 +0100
+++ b/scripts/xldd.in	Tue Nov 23 21:35:15 2010 +0100
@@ -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 @@
         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}"
 }