Merge branch 'master' into portable

diff --cc ChangeLog
Simple merge

diff --cc backends/ChangeLog
Simple merge

diff --cc backends/Makefile.am
index 5b49108b2be15d24e373fb7ef37fd841aff1d25d,687c089d35802cbf384cb89cc50228e02305e580..5ab9f9fdbd2da2f9d99113d66495cf70013f6b60
--- 1/backends/Makefile.am
--- 2/backends/Makefile.am
+++ b/backends/Makefile.am
@@@ -119,8 -119,8 +119,8 @@@ libebl_%.so libebl_%.map: libebl_%_pic.
        $(LINK) -shared -o $(@:.map=.so) \
                -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
                -Wl,--version-script,$(@:.so=.map) \
 -              -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
 +              -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
-       $(textrel_check)
+       @$(textrel_check)
  
  libebl_i386.so: $(cpu_i386)
  libebl_x86_64.so: $(cpu_x86_64)

diff --cc config/ChangeLog
Simple merge

diff --cc config/eu.am
Simple merge

diff --cc configure.ac
Simple merge

diff --cc libasm/ChangeLog
Simple merge

diff --cc libdw/ChangeLog
Simple merge

diff --cc libdw/dwarf_begin_elf.c
Simple merge

diff --cc libdw/libdw.h
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/addr2line.c
Simple merge

diff --cc src/findtextrel.c
Simple merge

diff --cc src/readelf.c
Simple merge

diff --cc src/strip.c
Simple merge

diff --cc tests/ChangeLog
Simple merge

diff --cc tests/Makefile.am
Simple merge