Merge remote-tracking branch 'origin/master' into portable

diff --cc ChangeLog
Simple merge

diff --cc backends/ChangeLog
Simple merge

diff --cc backends/Makefile.am
Simple merge

diff --cc config/ChangeLog
Simple merge

diff --cc config/eu.am
Simple merge

diff --cc configure.ac
index 1760ea3c3552323e29ed4c6fa99d32920b11374b,99b74ae518d80140255daf32d3d1895412dac83a..6a0b2093a631901c7b0938f952f4e9f566ee0270
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -371,6 -324,17 +380,17 @@@ case "$eu_version" i
  esac
  
  # Round up to the next release API (x.y) version.
 -eu_version=$(( (eu_version + 999) / 1000 ))
 +eu_version=`expr \( $eu_version + 999 \) / 1000`
  
+ AC_CHECK_SIZEOF(long)
+ 
+ # On a 64-bit host where can can use $CC -m32, we'll run two sets of tests.
+ # Likewise in a 32-bit build on a host where $CC -m64 works.
+ utrace_BIARCH
+ # `$utrace_biarch' will be `-m64' even on an uniarch i386 machine.
+ AS_IF([test $utrace_cv_cc_biarch = yes],
+       [CC_BIARCH="$CC $utrace_biarch"],
+       [CC_BIARCH="$CC"])
+ AC_SUBST([CC_BIARCH])
+ 
  AC_OUTPUT

diff --cc libdw/ChangeLog
Simple merge

diff --cc libdwfl/ChangeLog
Simple merge

diff --cc libebl/ChangeLog
Simple merge

diff --cc libelf/ChangeLog
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/readelf.c
Simple merge

diff --cc tests/ChangeLog
Simple merge