elfutils: Upgrade to 0.166

Has many fixes for compiling it with gcc-6

(From OE-Core rev: 071b6a0c3cdeb3635a8ccfbc708573723308dd68)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2016-05-11 10:35:07 -07:00
committed by Richard Purdie
parent a088a41107
commit 24d99279c5
20 changed files with 306 additions and 266 deletions

View File

@@ -0,0 +1,41 @@
From 836a16fe5b5bab4a3afe2c991c104652775ce3a3 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@cern.ch>
Date: Mon, 11 Apr 2016 16:00:57 +0200
Subject: elfcmp: fix self-comparison error with GCC 6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Noticed with Fedora 24 Alpha, gcc (GCC) 6.0.0 20160406
(Red Hat 6.0.0-0.20).
elfcmp.c: In function main:
elfcmp.c:364:199: error: self-comparison always evaluates
to false [-Werror=tautological-compare]
if (unlikely (name1 == NULL || name2 == NULL
Signed-off-by: David Abdurachmanov <davidlt@cern.ch>
---
Upstream-Status: Backport
src/ChangeLog | 4 ++++
src/elfcmp.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/elfcmp.c b/src/elfcmp.c
index 852b92f..7b5d39c 100644
--- a/src/elfcmp.c
+++ b/src/elfcmp.c
@@ -368,7 +368,7 @@ main (int argc, char *argv[])
&& sym1->st_shndx != SHN_UNDEF)
|| sym1->st_info != sym2->st_info
|| sym1->st_other != sym2->st_other
- || sym1->st_shndx != sym1->st_shndx))
+ || sym1->st_shndx != sym2->st_shndx))
{
// XXX Do we want to allow reordered symbol tables?
symtab_mismatch:
--
cgit v0.12

View File

@@ -25,11 +25,11 @@ Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
libelf/Makefile.am | 5 +++++
4 files changed, 23 insertions(+), 1 deletion(-)
Index: elfutils-0.164/configure.ac
Index: elfutils-0.166/configure.ac
===================================================================
--- elfutils-0.164.orig/configure.ac
+++ elfutils-0.164/configure.ac
@@ -66,6 +66,14 @@ AS_IF([test "$use_locks" = yes],
--- elfutils-0.166.orig/configure.ac
+++ elfutils-0.166/configure.ac
@@ -79,6 +79,14 @@ AS_IF([test "$use_locks" = yes],
AH_TEMPLATE([USE_LOCKS], [Defined if libraries should be thread-safe.])
@@ -44,7 +44,7 @@ Index: elfutils-0.164/configure.ac
AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_YACC
@@ -291,18 +299,13 @@ AC_LINK_IFELSE(
@@ -347,18 +355,13 @@ AC_LINK_IFELSE(
)
dnl If our libc doesn't provide argp, then test for libargp
@@ -70,10 +70,10 @@ Index: elfutils-0.164/configure.ac
AC_SUBST([argp_LDADD])
dnl The directories with content.
Index: elfutils-0.164/libcpu/Makefile.am
Index: elfutils-0.166/libcpu/Makefile.am
===================================================================
--- elfutils-0.164.orig/libcpu/Makefile.am
+++ elfutils-0.164/libcpu/Makefile.am
--- elfutils-0.166.orig/libcpu/Makefile.am
+++ elfutils-0.166/libcpu/Makefile.am
@@ -80,6 +80,10 @@ i386_parse_CFLAGS = -DNMNES="`wc -l < i3
i386_lex.o: i386_parse.h
i386_gendis_LDADD = $(libeu) -lm
@@ -85,10 +85,10 @@ Index: elfutils-0.164/libcpu/Makefile.am
i386_parse.h: i386_parse.c ;
EXTRA_DIST = defs/i386
Index: elfutils-0.164/libdw/Makefile.am
Index: elfutils-0.166/libdw/Makefile.am
===================================================================
--- elfutils-0.164.orig/libdw/Makefile.am
+++ elfutils-0.164/libdw/Makefile.am
--- elfutils-0.166.orig/libdw/Makefile.am
+++ elfutils-0.166/libdw/Makefile.am
@@ -102,6 +102,11 @@ endif
libdw_pic_a_SOURCES =
am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os)
@@ -105,21 +105,20 @@ Index: elfutils-0.164/libdw/Makefile.am
-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
-Wl,--version-script,$<,--no-undefined \
-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
- -ldl $(argp_LDADD) $(zip_LIBS)
+ -ldl $(argp_LDADD) $(zip_LIBS) $(libdw_so_LDLIBS)
- -ldl -lz $(argp_LDADD) $(zip_LIBS)
+ -ldl -lz $(argp_LDADD) $(zip_LIBS) $(libdw_so_LDLIBS)
@$(textrel_check)
$(AM_V_at)ln -fs $@ $@.$(VERSION)
Index: elfutils-0.164/libelf/Makefile.am
Index: elfutils-0.166/libelf/Makefile.am
===================================================================
--- elfutils-0.164.orig/libelf/Makefile.am
+++ elfutils-0.164/libelf/Makefile.am
@@ -93,7 +93,12 @@ libelf_a_SOURCES = elf_version.c elf_has
libelf_pic_a_SOURCES =
--- elfutils-0.166.orig/libelf/Makefile.am
+++ elfutils-0.166/libelf/Makefile.am
@@ -96,6 +96,11 @@ libelf_pic_a_SOURCES =
am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
libelf_so_LDLIBS = -lz
+
libelf_so_LDLIBS =
+if USE_UCLIBC
+libelf_so_LDLIBS += -lintl
+endif

View File

@@ -7,9 +7,8 @@ DEPENDS = "libtool bzip2 zlib virtual/libintl"
DEPENDS_append_libc-musl = " argp-standalone fts "
SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/${PV}/${BP}.tar.bz2"
SRC_URI[md5sum] = "2e4536c1c48034f188a80789a59114d8"
SRC_URI[sha256sum] = "9683c025928a12d06b7fe812928aa6235249e22d197d086f7084606a48165900"
SRC_URI[md5sum] = "d4e462b7891915dc5326bccefa2024ff"
SRC_URI[sha256sum] = "3c056914c8a438b210be0d790463b960fc79d234c3f05ce707cbff80e94cba30"
SRC_URI += "\
file://dso-link-change.patch \
@@ -36,6 +35,7 @@ SRC_URI += "\
file://0002-Add-support-for-mips64-abis-in-mips_retval.c.patch \
file://0003-Add-mips-n64-relocation-format-hack.patch \
file://uclibc-support.patch \
file://elfcmp-fix-self-comparision.patch \
"
SRC_URI_append_libc-musl = " file://0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch "