From: Mark Wielaard <mark@klomp.org>
Date: Sun, 1 Nov 2020 22:45:32 +0000 (+0100)
Subject: Merge tag 'elfutils-0.182' into mjw/RH-DTS
X-Git-Tag: dts-0.182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dd97a0a871672b3f7a58e1fb50b6f7195d8f32d;p=thirdparty%2Felfutils.git

Merge tag 'elfutils-0.182' into mjw/RH-DTS

elfutils 0.182 release
---

8dd97a0a871672b3f7a58e1fb50b6f7195d8f32d
diff --cc configure.ac
index f38c32c3a,515ac7049..b7e76504d
--- a/configure.ac
+++ b/configure.ac
@@@ -17,14 -17,8 +17,14 @@@ dnl  GNU General Public License for mor
  dnl
  dnl  You should have received a copy of the GNU General Public License
  dnl  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- AC_INIT([elfutils],[0.180],[https://sourceware.org/bugzilla],[elfutils],[http://elfutils.org/])
+ AC_INIT([elfutils],[0.182],[https://sourceware.org/bugzilla],[elfutils],[http://elfutils.org/])
  
 +dnl Workaround for older autoconf < 2.64
 +m4_ifndef([AC_PACKAGE_URL],
 +         [AC_DEFINE([PACKAGE_URL], ["http://elfutils.org/"],
 +                    [Define to home page for this package])
 +          AC_SUBST([PACKAGE_URL], ["http://elfutils.org/"])])
 +
  dnl Workaround for older autoconf < 2.64
  m4_ifndef([AC_PACKAGE_URL],
           [AC_DEFINE([PACKAGE_URL], ["http://elfutils.org/"],
diff --cc debuginfod/Makefile.am
index 47b6e431b,01985600e..8b07ed0b6
--- a/debuginfod/Makefile.am
+++ b/debuginfod/Makefile.am
@@@ -64,10 -76,11 +76,12 @@@ debuginfod_LDADD = $(libdw) $(libelf) $
  debuginfod_find_SOURCES = debuginfod-find.c
  debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod)
  
+ if LIBDEBUGINFOD
 -noinst_LIBRARIES = libdebuginfod.a
 -noinst_LIBRARIES += libdebuginfod_pic.a
 +lib_LIBRARIES = libdebuginfod.a
 +noinst_LIBRARIES = libdebuginfod_pic.a
+ endif
  
 +libdebuginfod_a_CFLAGS = -fPIC $(AM_CFLAGS)
  libdebuginfod_a_SOURCES = debuginfod-client.c
  libdebuginfod_pic_a_SOURCES = debuginfod-client.c
  am_libdebuginfod_pic_a_OBJECTS = $(libdebuginfod_a_SOURCES:.c=.os)
diff --cc libebl/eblopenbackend.c
index 6ce6c26fc,a8af16582..e16de6497
--- a/libebl/eblopenbackend.c
+++ b/libebl/eblopenbackend.c
@@@ -71,17 -78,17 +71,17 @@@ static const struc
    { x86_64_init, "elf_x86_64", "x86_64", 6, EM_X86_64, ELFCLASS64, ELFDATA2LSB },
    { ppc_init, "elf_ppc", "ppc", 3, EM_PPC, ELFCLASS32, ELFDATA2MSB },
    { ppc64_init, "elf_ppc64", "ppc64", 5, EM_PPC64, ELFCLASS64, ELFDATA2MSB },
-   { NULL, "elf_tilegx", "tilegx", 6, EM_TILEGX, ELFCLASS64, ELFDATA2LSB },
    // XXX class and machine fields need to be filled in for all archs.
 -  { sh_init, "elf_sh", "sh", 2, EM_SH, 0, 0 },
 -  { arm_init, "ebl_arm", "arm", 3, EM_ARM, 0, 0 },
 -  { sparc_init, "elf_sparcv9", "sparc", 5, EM_SPARCV9, 0, 0 },
 -  { sparc_init, "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },
 -  { sparc_init, "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },
 +  { NULL, "elf_sh", "sh", 2, EM_SH, 0, 0 },
 +  { NULL, "ebl_arm", "arm", 3, EM_ARM, 0, 0 },
 +  { NULL, "elf_sparcv9", "sparc", 5, EM_SPARCV9, 0, 0 },
 +  { NULL, "elf_sparc", "sparc", 5, EM_SPARC, 0, 0 },
 +  { NULL, "elf_sparcv8plus", "sparc", 5, EM_SPARC32PLUS, 0, 0 },
    { s390_init, "ebl_s390", "s390", 4, EM_S390, 0, 0 },
  
+   { NULL, "elf_tilegx", "tilegx", 6, EM_TILEGX, ELFCLASS64, ELFDATA2LSB },
    { NULL, "elf_m32", "m32", 3, EM_M32, 0, 0 },
 -  { m68k_init, "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB },
 +  { NULL, "elf_m68k", "m68k", 4, EM_68K, ELFCLASS32, ELFDATA2MSB },
    { NULL, "elf_m88k", "m88k", 4, EM_88K, 0, 0 },
    { NULL, "elf_i860", "i860", 4, EM_860, 0, 0 },
    { NULL, "ebl_s370", "s370", 4, EM_S370, 0, 0 },
diff --cc tests/Makefile.am
index fa4999dff,84f6e88ec..0a7766929
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -175,8 -183,10 +182,9 @@@ TESTS = run-arextract.sh run-arsymtest.
  	run-readelf-discr.sh \
  	run-dwelf_elf_e_machine_string.sh \
  	run-elfclassify.sh run-elfclassify-self.sh \
 -	run-disasm-riscv64.sh \
  	run-pt_gnu_prop-tests.sh \
- 	run-getphdrnum.sh
+ 	run-getphdrnum.sh run-test-includes.sh \
+ 	leb128 read_unaligned
  
  if !BIARCH
  export ELFUTILS_DISABLE_BIARCH = 1