* testsuite/final_layout.sh: Use dc to convert from hex to

	decimal.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 006b1df..f0062d5 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-02  Ian Lance Taylor  <iant@google.com>
+
+       * testsuite/final_layout.sh: Use dc to convert from hex to
+       decimal.
+
 2010-07-29  Sriraman Tallam  <tmsriram@google.com>
 
        * arm.cc (Target_arm<big_endian>::gc_process_relocs): Add template

diff --git a/gold/testsuite/final_layout.sh b/gold/testsuite/final_layout.sh
index ed7ad78..01b1f1d 100755 (executable)
--- a/gold/testsuite/final_layout.sh
+++ b/gold/testsuite/final_layout.sh
@@ -27,8 +27,10 @@
 
 check()
 {
-    func_addr_1=$((16#`grep $2 $1 | awk '{print $1}'`))
-    func_addr_2=$((16#`grep $3 $1 | awk '{print $1}'`))
+    func_addr_1=`grep $2 $1 | awk '{print $1}' | tr 'abcdef' 'ABCDEF'`
+    func_addr_1=`echo 16i${func_addr_1}p | dc`
+    func_addr_2=`grep $3 $1 | awk '{print $1}' | tr 'abcdef' 'ABCDEF'`
+    func_addr_2=`echo 16i${func_addr_2}p | dc`
     if [ $func_addr_1 -gt $func_addr_2 ]
     then
         echo "final layout of" $2 "and" $3 "is not right."