summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2015-01-09 18:59:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:30 +0000
commit0421c67c02273ff49db63c5b6c25db3292032038 (patch)
tree783a6bf69ef975f41f4efedeb52a5523bc09eb5a /meta
parent5832ed334048fa8c63b962b7d7c8a4a8fc616d56 (diff)
downloadpoky-0421c67c02273ff49db63c5b6c25db3292032038.tar.gz
elfutils: upgrade to 1.161
Drop PREFERRED_VERSION_elfutils in meta/conf/distro/include/ tcmode-default.inc, it builds the latest version by default. (From OE-Core rev: 7ff30c54439a761d66fd4ceca80073e3653373bf) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc1
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/arm_backend.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/arm_backend.diff)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/arm_func_value.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/arm_func_value.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/arm_unwind_ret_mask.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/arm_unwind_ret_mask.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/fixheadercheck.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/fixheadercheck.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/hppa_backend.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/hppa_backend.diff)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/m68k_backend.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/m68k_backend.diff)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/mips_backend.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/mips_backend.diff)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/mips_readelf_w.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/mips_readelf_w.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/non_linux.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/non_linux.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/redhat-portability.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/redhat-portability.diff)564
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/scanf-format.patch (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/scanf-format.patch)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/testsuite-ignore-elflint.diff (renamed from meta/recipes-devtools/elfutils/elfutils-0.160/testsuite-ignore-elflint.diff)0
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.161.bb (renamed from meta/recipes-devtools/elfutils/elfutils_0.160.bb)4
14 files changed, 305 insertions, 264 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index b4c3c70823..ae6aaf3c5d 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -61,7 +61,6 @@ PREFERRED_VERSION_nativesdk-glibc-initial ?= "${GLIBCVERSION}"
61PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}" 61PREFERRED_VERSION_cross-localedef-native ?= "${GLIBCVERSION}"
62PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" 62PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}"
63PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" 63PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}"
64PREFERRED_VERSION_elfutils ?= "0.160"
65# don't use version earlier than 1.4 for gzip-native, as it's necessary for 64# don't use version earlier than 1.4 for gzip-native, as it's necessary for
66# some packages using an archive format incompatible with earlier gzip 65# some packages using an archive format incompatible with earlier gzip
67PREFERRED_VERSION_gzip-native ?= "1.6" 66PREFERRED_VERSION_gzip-native ?= "1.6"
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/arm_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_backend.diff
index c97c4e470d..c97c4e470d 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/arm_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/arm_func_value.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_func_value.patch
index eeb2063807..eeb2063807 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/arm_func_value.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_func_value.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/arm_unwind_ret_mask.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_unwind_ret_mask.patch
index 8abb36bb49..8abb36bb49 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/arm_unwind_ret_mask.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_unwind_ret_mask.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/fixheadercheck.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/fixheadercheck.patch
index 8796e9a394..8796e9a394 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/fixheadercheck.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/fixheadercheck.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/hppa_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/hppa_backend.diff
index d51a720073..d51a720073 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/hppa_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/hppa_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/m68k_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/m68k_backend.diff
index f5b566f2d5..f5b566f2d5 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/m68k_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/m68k_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/mips_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_backend.diff
index d73a3f2869..d73a3f2869 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/mips_backend.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/mips_readelf_w.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_readelf_w.patch
index 8e669e7199..8e669e7199 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/mips_readelf_w.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_readelf_w.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/non_linux.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/non_linux.patch
index 35b1b389fb..35b1b389fb 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/non_linux.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/non_linux.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/redhat-portability.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/redhat-portability.diff
index a358b11fe6..08f25a53eb 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/redhat-portability.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/redhat-portability.diff
@@ -1,58 +1,47 @@
1Index: elfutils-0.159/backends/ChangeLog 1Rebase to 1.161
2=================================================================== 2
3--- elfutils-0.159.orig/backends/ChangeLog 3Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
4+++ elfutils-0.159/backends/ChangeLog 4---
5@@ -364,6 +364,10 @@ 5 ChangeLog | 30 +++++++++++++++++++++++
6 * ppc_attrs.c (ppc_check_object_attribute): Handle tag 6 backends/ChangeLog | 12 +++++++++
7 GNU_Power_ABI_Struct_Return. 7 backends/Makefile.am | 2 +-
8 8 config/ChangeLog | 4 +++
9+2009-01-23 Roland McGrath <roland@redhat.com> 9 config/eu.am | 14 ++++++++---
10+ 10 configure.ac | 60 +++++++++++++++++++++++++++++++++++++++++++--
11+ * Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED). 11 lib/ChangeLog | 8 ++++++
12+ 12 lib/eu-config.h | 11 +++++++++
13 2008-10-04 Ulrich Drepper <drepper@redhat.com> 13 libasm/ChangeLog | 5 ++++
14 14 libcpu/ChangeLog | 8 ++++++
15 * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and 15 libcpu/i386_disasm.c | 1 +
16@@ -691,6 +695,11 @@ 16 libdw/ChangeLog | 13 ++++++++++
17 * sparc_init.c: Likewise. 17 libdw/dwarf_begin_elf.c | 8 ++++++
18 * x86_64_init.c: Likewise. 18 libdw/libdw.h | 2 +-
19 19 libdwfl/ChangeLog | 20 +++++++++++++++
20+2005-11-22 Roland McGrath <roland@redhat.com> 20 libdwfl/linux-core-attach.c | 29 ++++++++++++++++++++++
21+ 21 libdwfl/linux-pid-attach.c | 14 +++++++++++
22+ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure. 22 libebl/ChangeLog | 5 ++++
23+ (libebl_%.so rule): Use it in place of -Wl,--as-needed. 23 libelf/ChangeLog | 10 ++++++++
24+ 24 libelf/common.h | 4 +--
25 2005-11-19 Roland McGrath <roland@redhat.com> 25 libelf/gnuhash_xlate.h | 6 +++--
26 26 src/ChangeLog | 30 +++++++++++++++++++++++
27 * ppc64_reloc.def: REL30 -> ADDR30. 27 src/Makefile.am | 5 ++++
28@@ -713,6 +722,9 @@ 28 src/addr2line.c | 4 +--
29 * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). 29 src/findtextrel.c | 6 ++++-
30 (CLEANFILES): Add libebl_$(m).so. 30 src/ld.h | 2 ++
31 31 src/readelf.c | 15 ++++++++----
32+ * Makefile.am (WEXTRA): New variable, substituted by configure. 32 src/strings.c | 11 +++++++++
33+ (AM_CFLAGS): Use it in place of -Wextra. 33 src/strip.c | 20 +++++++++++++--
34+ 34 tests/ChangeLog | 14 +++++++++++
35 * ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>. 35 tests/Makefile.am | 1 +
36 * ppc64_reloc.def: Likewise. 36 tests/backtrace.c | 1 +
37 37 tests/line2addr.c | 2 +-
38Index: elfutils-0.159/backends/Makefile.am 38 33 files changed, 355 insertions(+), 22 deletions(-)
39=================================================================== 39
40--- elfutils-0.159.orig/backends/Makefile.am 40diff --git a/ChangeLog b/ChangeLog
41+++ elfutils-0.159/backends/Makefile.am 41index f81b302..3f9eaf1 100644
42@@ -119,7 +119,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a 42--- a/ChangeLog
43 $(LINK) -shared -o $(@:.map=.so) \ 43+++ b/ChangeLog
44 -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ 44@@ -187,6 +187,8 @@
45 -Wl,--version-script,$(@:.so=.map) \
46- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
47+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
48 $(textrel_check)
49
50 libebl_i386.so: $(cpu_i386)
51Index: elfutils-0.159/ChangeLog
52===================================================================
53--- elfutils-0.159.orig/ChangeLog
54+++ elfutils-0.159/ChangeLog
55@@ -148,6 +148,8 @@
56 45
57 2012-01-24 Mark Wielaard <mjw@redhat.com> 46 2012-01-24 Mark Wielaard <mjw@redhat.com>
58 47
@@ -61,7 +50,7 @@ Index: elfutils-0.159/ChangeLog
61 * COPYING: Fix address. Updated version from gnulib. 50 * COPYING: Fix address. Updated version from gnulib.
62 51
63 2012-01-23 Mark Wielaard <mjw@redhat.com> 52 2012-01-23 Mark Wielaard <mjw@redhat.com>
64@@ -166,6 +168,9 @@ 53@@ -205,6 +207,9 @@
65 54
66 2011-10-08 Mike Frysinger <vapier@gentoo.org> 55 2011-10-08 Mike Frysinger <vapier@gentoo.org>
67 56
@@ -71,7 +60,7 @@ Index: elfutils-0.159/ChangeLog
71 * configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly. 60 * configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
72 61
73 2011-10-02 Ulrich Drepper <drepper@gmail.com> 62 2011-10-02 Ulrich Drepper <drepper@gmail.com>
74@@ -187,6 +192,10 @@ 63@@ -226,6 +231,10 @@
75 64
76 * configure.ac (LOCALEDIR, DATADIRNAME): Removed. 65 * configure.ac (LOCALEDIR, DATADIRNAME): Removed.
77 66
@@ -82,7 +71,7 @@ Index: elfutils-0.159/ChangeLog
82 2009-09-21 Ulrich Drepper <drepper@redhat.com> 71 2009-09-21 Ulrich Drepper <drepper@redhat.com>
83 72
84 * configure.ac: Update for more modern autoconf. 73 * configure.ac: Update for more modern autoconf.
85@@ -195,6 +204,10 @@ 74@@ -234,6 +243,10 @@
86 75
87 * configure.ac (zip_LIBS): Check for liblzma too. 76 * configure.ac (zip_LIBS): Check for liblzma too.
88 77
@@ -93,7 +82,7 @@ Index: elfutils-0.159/ChangeLog
93 2009-04-19 Roland McGrath <roland@redhat.com> 82 2009-04-19 Roland McGrath <roland@redhat.com>
94 83
95 * configure.ac (eu_version): Round down here, not in version.h macros. 84 * configure.ac (eu_version): Round down here, not in version.h macros.
96@@ -206,6 +219,8 @@ 85@@ -245,6 +258,8 @@
97 86
98 2009-01-23 Roland McGrath <roland@redhat.com> 87 2009-01-23 Roland McGrath <roland@redhat.com>
99 88
@@ -102,7 +91,7 @@ Index: elfutils-0.159/ChangeLog
102 * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3. 91 * configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
103 92
104 * configure.ac (__thread check): Use AC_LINK_IFELSE, in case of 93 * configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
105@@ -286,6 +301,10 @@ 94@@ -325,6 +340,10 @@
106 * configure.ac: Add dummy automake conditional to get dependencies 95 * configure.ac: Add dummy automake conditional to get dependencies
107 for non-generic linker right. See src/Makefile.am. 96 for non-generic linker right. See src/Makefile.am.
108 97
@@ -113,7 +102,7 @@ Index: elfutils-0.159/ChangeLog
113 2005-11-18 Roland McGrath <roland@redhat.com> 102 2005-11-18 Roland McGrath <roland@redhat.com>
114 103
115 * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable. 104 * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
116@@ -333,6 +352,17 @@ 105@@ -372,6 +391,17 @@
117 * Makefile.am (all_SUBDIRS): Add libdwfl. 106 * Makefile.am (all_SUBDIRS): Add libdwfl.
118 * configure.ac: Write libdwfl/Makefile. 107 * configure.ac: Write libdwfl/Makefile.
119 108
@@ -131,11 +120,61 @@ Index: elfutils-0.159/ChangeLog
131 2005-05-19 Roland McGrath <roland@redhat.com> 120 2005-05-19 Roland McGrath <roland@redhat.com>
132 121
133 * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros. 122 * configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
134Index: elfutils-0.159/config/ChangeLog 123diff --git a/backends/ChangeLog b/backends/ChangeLog
135=================================================================== 124index e800d16..6a86248 100644
136--- elfutils-0.159.orig/config/ChangeLog 125--- a/backends/ChangeLog
137+++ elfutils-0.159/config/ChangeLog 126+++ b/backends/ChangeLog
138@@ -58,6 +58,10 @@ 127@@ -433,6 +433,10 @@
128 * ppc_attrs.c (ppc_check_object_attribute): Handle tag
129 GNU_Power_ABI_Struct_Return.
130
131+2009-01-23 Roland McGrath <roland@redhat.com>
132+
133+ * Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
134+
135 2008-10-04 Ulrich Drepper <drepper@redhat.com>
136
137 * i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
138@@ -760,6 +764,11 @@
139 * sparc_init.c: Likewise.
140 * x86_64_init.c: Likewise.
141
142+2005-11-22 Roland McGrath <roland@redhat.com>
143+
144+ * Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
145+ (libebl_%.so rule): Use it in place of -Wl,--as-needed.
146+
147 2005-11-19 Roland McGrath <roland@redhat.com>
148
149 * ppc64_reloc.def: REL30 -> ADDR30.
150@@ -782,6 +791,9 @@
151 * Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
152 (CLEANFILES): Add libebl_$(m).so.
153
154+ * Makefile.am (WEXTRA): New variable, substituted by configure.
155+ (AM_CFLAGS): Use it in place of -Wextra.
156+
157 * ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
158 * ppc64_reloc.def: Likewise.
159
160diff --git a/backends/Makefile.am b/backends/Makefile.am
161index 4d15a5d..507c9df 100644
162--- a/backends/Makefile.am
163+++ b/backends/Makefile.am
164@@ -131,7 +131,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw)
165 $(LINK) -shared -o $(@:.map=.so) \
166 -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
167 -Wl,--version-script,$(@:.so=.map) \
168- -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
169+ -Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
170 @$(textrel_check)
171
172 libebl_i386.so: $(cpu_i386)
173diff --git a/config/ChangeLog b/config/ChangeLog
174index 1b4e896..058dd88 100644
175--- a/config/ChangeLog
176+++ b/config/ChangeLog
177@@ -71,6 +71,10 @@
139 178
140 * known-dwarf.awk: Use gawk. 179 * known-dwarf.awk: Use gawk.
141 180
@@ -146,10 +185,10 @@ Index: elfutils-0.159/config/ChangeLog
146 2010-07-02 Ulrich Drepper <drepper@redhat.com> 185 2010-07-02 Ulrich Drepper <drepper@redhat.com>
147 186
148 * elfutils.spec.in: Add more BuildRequires. 187 * elfutils.spec.in: Add more BuildRequires.
149Index: elfutils-0.159/config/eu.am 188diff --git a/config/eu.am b/config/eu.am
150=================================================================== 189index faf8add..6ca36a5 100644
151--- elfutils-0.159.orig/config/eu.am 190--- a/config/eu.am
152+++ elfutils-0.159/config/eu.am 191+++ b/config/eu.am
153@@ -1,6 +1,6 @@ 192@@ -1,6 +1,6 @@
154 ## Common automake fragments for elfutils subdirectory makefiles. 193 ## Common automake fragments for elfutils subdirectory makefiles.
155 ## 194 ##
@@ -182,10 +221,10 @@ Index: elfutils-0.159/config/eu.am
182 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) 221 COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
183 222
184 %.os: %.c %.o 223 %.os: %.c %.o
185Index: elfutils-0.159/configure.ac 224diff --git a/configure.ac b/configure.ac
186=================================================================== 225index 0e67a79..a1ad6db 100644
187--- elfutils-0.159.orig/configure.ac 226--- a/configure.ac
188+++ elfutils-0.159/configure.ac 227+++ b/configure.ac
189@@ -89,6 +89,54 @@ CFLAGS="$old_CFLAGS"]) 228@@ -89,6 +89,54 @@ CFLAGS="$old_CFLAGS"])
190 AS_IF([test "x$ac_cv_c99" != xyes], 229 AS_IF([test "x$ac_cv_c99" != xyes],
191 AC_MSG_ERROR([gcc with C99 support required])) 230 AC_MSG_ERROR([gcc with C99 support required]))
@@ -241,7 +280,7 @@ Index: elfutils-0.159/configure.ac
241 AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl 280 AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
242 # Use the same flags that we use for our DSOs, so the test is representative. 281 # Use the same flags that we use for our DSOs, so the test is representative.
243 # Some old compiler/linker/libc combinations fail some ways and not others. 282 # Some old compiler/linker/libc combinations fail some ways and not others.
244@@ -104,7 +152,10 @@ static __thread int a; int foo (int b) { 283@@ -104,7 +152,10 @@ static __thread int a; int foo (int b) { return a + b; }]],
245 CFLAGS="$save_CFLAGS" 284 CFLAGS="$save_CFLAGS"
246 LDFLAGS="$save_LDFLAGS"]) 285 LDFLAGS="$save_LDFLAGS"])
247 AS_IF([test "x$ac_cv_tls" != xyes], 286 AS_IF([test "x$ac_cv_tls" != xyes],
@@ -253,7 +292,7 @@ Index: elfutils-0.159/configure.ac
253 292
254 dnl This test must come as early as possible after the compiler configuration 293 dnl This test must come as early as possible after the compiler configuration
255 dnl tests, because the choice of the file model can (in principle) affect 294 dnl tests, because the choice of the file model can (in principle) affect
256@@ -183,6 +234,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_ 295@@ -183,6 +234,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_valgrind" = yes)
257 AM_CONDITIONAL(BUILD_STATIC, [dnl 296 AM_CONDITIONAL(BUILD_STATIC, [dnl
258 test "$use_gprof" = yes -o "$use_gcov" = yes]) 297 test "$use_gprof" = yes -o "$use_gcov" = yes])
259 298
@@ -265,7 +304,7 @@ Index: elfutils-0.159/configure.ac
265 AC_ARG_ENABLE([tests-rpath], 304 AC_ARG_ENABLE([tests-rpath],
266 AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]), 305 AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),
267 [tests_use_rpath=$enableval], [tests_use_rpath=no]) 306 [tests_use_rpath=$enableval], [tests_use_rpath=no])
268@@ -297,7 +353,7 @@ case "$eu_version" in 307@@ -302,7 +358,7 @@ case "$eu_version" in
269 esac 308 esac
270 309
271 # Round up to the next release API (x.y) version. 310 # Round up to the next release API (x.y) version.
@@ -274,10 +313,10 @@ Index: elfutils-0.159/configure.ac
274 313
275 AC_CHECK_SIZEOF(long) 314 AC_CHECK_SIZEOF(long)
276 315
277Index: elfutils-0.159/lib/ChangeLog 316diff --git a/lib/ChangeLog b/lib/ChangeLog
278=================================================================== 317index 4415213..4911cc1 100644
279--- elfutils-0.159.orig/lib/ChangeLog 318--- a/lib/ChangeLog
280+++ elfutils-0.159/lib/ChangeLog 319+++ b/lib/ChangeLog
281@@ -65,6 +65,9 @@ 320@@ -65,6 +65,9 @@
282 321
283 2009-01-23 Roland McGrath <roland@redhat.com> 322 2009-01-23 Roland McGrath <roland@redhat.com>
@@ -300,11 +339,11 @@ Index: elfutils-0.159/lib/ChangeLog
300 2005-04-30 Ulrich Drepper <drepper@redhat.com> 339 2005-04-30 Ulrich Drepper <drepper@redhat.com>
301 340
302 * Makefile.am: Use -ffunction-sections for xmalloc.c. 341 * Makefile.am: Use -ffunction-sections for xmalloc.c.
303Index: elfutils-0.159/lib/eu-config.h 342diff --git a/lib/eu-config.h b/lib/eu-config.h
304=================================================================== 343index 3afff26..d89f3a8 100644
305--- elfutils-0.159.orig/lib/eu-config.h 344--- a/lib/eu-config.h
306+++ elfutils-0.159/lib/eu-config.h 345+++ b/lib/eu-config.h
307@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr 346@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .previous\n"
308 /* This macro is used by the tests conditionalize for standalone building. */ 347 /* This macro is used by the tests conditionalize for standalone building. */
309 #define ELFUTILS_HEADER(name) <lib##name.h> 348 #define ELFUTILS_HEADER(name) <lib##name.h>
310 349
@@ -322,11 +361,11 @@ Index: elfutils-0.159/lib/eu-config.h
322 361
323 #ifdef SHARED 362 #ifdef SHARED
324 # define OLD_VERSION(name, version) \ 363 # define OLD_VERSION(name, version) \
325Index: elfutils-0.159/libasm/ChangeLog 364diff --git a/libasm/ChangeLog b/libasm/ChangeLog
326=================================================================== 365index 9b25af9..32b9fd0 100644
327--- elfutils-0.159.orig/libasm/ChangeLog 366--- a/libasm/ChangeLog
328+++ elfutils-0.159/libasm/ChangeLog 367+++ b/libasm/ChangeLog
329@@ -79,6 +79,11 @@ 368@@ -87,6 +87,11 @@
330 * asm_error.c: Add new error ASM_E_IOERROR. 369 * asm_error.c: Add new error ASM_E_IOERROR.
331 * libasmP.h: Add ASM_E_IOERROR definition. 370 * libasmP.h: Add ASM_E_IOERROR definition.
332 371
@@ -338,10 +377,10 @@ Index: elfutils-0.159/libasm/ChangeLog
338 2005-02-15 Ulrich Drepper <drepper@redhat.com> 377 2005-02-15 Ulrich Drepper <drepper@redhat.com>
339 378
340 * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. 379 * Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
341Index: elfutils-0.159/libcpu/ChangeLog 380diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
342=================================================================== 381index a20f440..5ea23b7 100644
343--- elfutils-0.159.orig/libcpu/ChangeLog 382--- a/libcpu/ChangeLog
344+++ elfutils-0.159/libcpu/ChangeLog 383+++ b/libcpu/ChangeLog
345@@ -51,6 +51,9 @@ 384@@ -51,6 +51,9 @@
346 385
347 2009-01-23 Roland McGrath <roland@redhat.com> 386 2009-01-23 Roland McGrath <roland@redhat.com>
@@ -364,11 +403,11 @@ Index: elfutils-0.159/libcpu/ChangeLog
364 2005-02-15 Ulrich Drepper <drepper@redhat.com> 403 2005-02-15 Ulrich Drepper <drepper@redhat.com>
365 404
366 * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2. 405 * Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
367Index: elfutils-0.159/libcpu/i386_disasm.c 406diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c
368=================================================================== 407index 832241f..c7a0df0 100644
369--- elfutils-0.159.orig/libcpu/i386_disasm.c 408--- a/libcpu/i386_disasm.c
370+++ elfutils-0.159/libcpu/i386_disasm.c 409+++ b/libcpu/i386_disasm.c
371@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con 410@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, const uint8_t *end, GElf_Addr addr,
372 411
373 default: 412 default:
374 assert (! "INVALID not handled"); 413 assert (! "INVALID not handled");
@@ -376,11 +415,11 @@ Index: elfutils-0.159/libcpu/i386_disasm.c
376 } 415 }
377 } 416 }
378 else 417 else
379Index: elfutils-0.159/libdw/ChangeLog 418diff --git a/libdw/ChangeLog b/libdw/ChangeLog
380=================================================================== 419index abc2d71..a9ee0b0 100644
381--- elfutils-0.159.orig/libdw/ChangeLog 420--- a/libdw/ChangeLog
382+++ elfutils-0.159/libdw/ChangeLog 421+++ b/libdw/ChangeLog
383@@ -420,6 +420,10 @@ 422@@ -717,6 +717,10 @@
384 423
385 * Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk. 424 * Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
386 425
@@ -391,7 +430,7 @@ Index: elfutils-0.159/libdw/ChangeLog
391 2011-07-14 Mark Wielaard <mjw@redhat.com> 430 2011-07-14 Mark Wielaard <mjw@redhat.com>
392 431
393 * libdw.h (dwarf_offdie): Fix documentation to mention .debug_info. 432 * libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
394@@ -779,6 +783,10 @@ 433@@ -1076,6 +1080,10 @@
395 434
396 * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too. 435 * dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
397 436
@@ -402,7 +441,7 @@ Index: elfutils-0.159/libdw/ChangeLog
402 2009-08-10 Roland McGrath <roland@redhat.com> 441 2009-08-10 Roland McGrath <roland@redhat.com>
403 442
404 * dwarf_getscopevar.c: Use dwarf_diename. 443 * dwarf_getscopevar.c: Use dwarf_diename.
405@@ -1547,6 +1555,11 @@ 444@@ -1844,6 +1852,11 @@
406 445
407 2005-05-31 Roland McGrath <roland@redhat.com> 446 2005-05-31 Roland McGrath <roland@redhat.com>
408 447
@@ -414,10 +453,10 @@ Index: elfutils-0.159/libdw/ChangeLog
414 * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to 453 * dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
415 formref offset. 454 formref offset.
416 455
417Index: elfutils-0.159/libdw/dwarf_begin_elf.c 456diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
418=================================================================== 457index 4c49ce2..7ea1430 100644
419--- elfutils-0.159.orig/libdw/dwarf_begin_elf.c 458--- a/libdw/dwarf_begin_elf.c
420+++ elfutils-0.159/libdw/dwarf_begin_elf.c 459+++ b/libdw/dwarf_begin_elf.c
421@@ -47,6 +47,14 @@ 460@@ -47,6 +47,14 @@
422 #if USE_ZLIB 461 #if USE_ZLIB
423 # include <endian.h> 462 # include <endian.h>
@@ -433,11 +472,11 @@ Index: elfutils-0.159/libdw/dwarf_begin_elf.c
433 # include <zlib.h> 472 # include <zlib.h>
434 # undef crc32 473 # undef crc32
435 #endif 474 #endif
436Index: elfutils-0.159/libdw/libdw.h 475diff --git a/libdw/libdw.h b/libdw/libdw.h
437=================================================================== 476index b2b2282..722c589 100644
438--- elfutils-0.159.orig/libdw/libdw.h 477--- a/libdw/libdw.h
439+++ elfutils-0.159/libdw/libdw.h 478+++ b/libdw/libdw.h
440@@ -891,7 +891,7 @@ extern Dwarf_OOM dwarf_new_oom_handler ( 479@@ -1003,7 +1003,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (Dwarf *dbg, Dwarf_OOM handler);
441 480
442 481
443 /* Inline optimizations. */ 482 /* Inline optimizations. */
@@ -446,11 +485,11 @@ Index: elfutils-0.159/libdw/libdw.h
446 /* Return attribute code of given attribute. */ 485 /* Return attribute code of given attribute. */
447 __libdw_extern_inline unsigned int 486 __libdw_extern_inline unsigned int
448 dwarf_whatattr (Dwarf_Attribute *attr) 487 dwarf_whatattr (Dwarf_Attribute *attr)
449Index: elfutils-0.159/libdwfl/ChangeLog 488diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
450=================================================================== 489index 69e59a6..15c2987 100644
451--- elfutils-0.159.orig/libdwfl/ChangeLog 490--- a/libdwfl/ChangeLog
452+++ elfutils-0.159/libdwfl/ChangeLog 491+++ b/libdwfl/ChangeLog
453@@ -421,6 +421,21 @@ 492@@ -571,6 +571,21 @@
454 (dwfl_module_addrsym) (i_to_symfile): New function. 493 (dwfl_module_addrsym) (i_to_symfile): New function.
455 (dwfl_module_addrsym) (search_table): Use it. 494 (dwfl_module_addrsym) (search_table): Use it.
456 495
@@ -472,7 +511,7 @@ Index: elfutils-0.159/libdwfl/ChangeLog
472 2013-11-07 Jan Kratochvil <jan.kratochvil@redhat.com> 511 2013-11-07 Jan Kratochvil <jan.kratochvil@redhat.com>
473 Mark Wielaard <mjw@redhat.com> 512 Mark Wielaard <mjw@redhat.com>
474 513
475@@ -2186,6 +2201,11 @@ 514@@ -2336,6 +2351,11 @@
476 515
477 2005-07-21 Roland McGrath <roland@redhat.com> 516 2005-07-21 Roland McGrath <roland@redhat.com>
478 517
@@ -484,10 +523,10 @@ Index: elfutils-0.159/libdwfl/ChangeLog
484 * Makefile.am (noinst_HEADERS): Add loc2c.c. 523 * Makefile.am (noinst_HEADERS): Add loc2c.c.
485 524
486 * test2.c (main): Check sscanf result to quiet warning. 525 * test2.c (main): Check sscanf result to quiet warning.
487Index: elfutils-0.159/libdwfl/linux-core-attach.c 526diff --git a/libdwfl/linux-core-attach.c b/libdwfl/linux-core-attach.c
488=================================================================== 527index 5a7b3b3..d05ac7e 100644
489--- elfutils-0.159.orig/libdwfl/linux-core-attach.c 528--- a/libdwfl/linux-core-attach.c
490+++ elfutils-0.159/libdwfl/linux-core-attach.c 529+++ b/libdwfl/linux-core-attach.c
491@@ -29,6 +29,35 @@ 530@@ -29,6 +29,35 @@
492 #include "libdwflP.h" 531 #include "libdwflP.h"
493 #include <fcntl.h> 532 #include <fcntl.h>
@@ -522,12 +561,12 @@ Index: elfutils-0.159/libdwfl/linux-core-attach.c
522+# endif 561+# endif
523+#endif 562+#endif
524 563
525 #ifndef MIN 564 #include "../libdw/memory-access.h"
526 # define MIN(a, b) ((a) < (b) ? (a) : (b)) 565
527Index: elfutils-0.159/libdwfl/linux-pid-attach.c 566diff --git a/libdwfl/linux-pid-attach.c b/libdwfl/linux-pid-attach.c
528=================================================================== 567index efbcf03..ae5af38 100644
529--- elfutils-0.159.orig/libdwfl/linux-pid-attach.c 568--- a/libdwfl/linux-pid-attach.c
530+++ elfutils-0.159/libdwfl/linux-pid-attach.c 569+++ b/libdwfl/linux-pid-attach.c
531@@ -255,6 +255,11 @@ void 570@@ -255,6 +255,11 @@ void
532 internal_function 571 internal_function
533 __libdwfl_ptrace_detach (pid_t tid, bool tid_was_stopped) 572 __libdwfl_ptrace_detach (pid_t tid, bool tid_was_stopped)
@@ -540,7 +579,7 @@ Index: elfutils-0.159/libdwfl/linux-pid-attach.c
540 /* This handling is needed only on older Linux kernels such as 579 /* This handling is needed only on older Linux kernels such as
541 2.6.32-358.23.2.el6.ppc64. Later kernels such as 580 2.6.32-358.23.2.el6.ppc64. Later kernels such as
542 3.11.7-200.fc19.x86_64 remember the T (stopped) state 581 3.11.7-200.fc19.x86_64 remember the T (stopped) state
543@@ -262,6 +267,15 @@ __libdwfl_ptrace_detach (pid_t tid, bool 582@@ -262,6 +267,15 @@ __libdwfl_ptrace_detach (pid_t tid, bool tid_was_stopped)
544 PTRACE_DETACH. */ 583 PTRACE_DETACH. */
545 ptrace (PTRACE_DETACH, tid, NULL, 584 ptrace (PTRACE_DETACH, tid, NULL,
546 (void *) (intptr_t) (tid_was_stopped ? SIGSTOP : 0)); 585 (void *) (intptr_t) (tid_was_stopped ? SIGSTOP : 0));
@@ -556,11 +595,11 @@ Index: elfutils-0.159/libdwfl/linux-pid-attach.c
556 } 595 }
557 596
558 static void 597 static void
559Index: elfutils-0.159/libebl/ChangeLog 598diff --git a/libebl/ChangeLog b/libebl/ChangeLog
560=================================================================== 599index 5e635f2..998544f 100644
561--- elfutils-0.159.orig/libebl/ChangeLog 600--- a/libebl/ChangeLog
562+++ elfutils-0.159/libebl/ChangeLog 601+++ b/libebl/ChangeLog
563@@ -748,6 +748,11 @@ 602@@ -765,6 +765,11 @@
564 * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency 603 * Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
565 tracking works right. 604 tracking works right.
566 605
@@ -572,11 +611,11 @@ Index: elfutils-0.159/libebl/ChangeLog
572 2005-05-21 Ulrich Drepper <drepper@redhat.com> 611 2005-05-21 Ulrich Drepper <drepper@redhat.com>
573 612
574 * libebl_x86_64.map: Add x86_64_core_note. 613 * libebl_x86_64.map: Add x86_64_core_note.
575Index: elfutils-0.159/libelf/ChangeLog 614diff --git a/libelf/ChangeLog b/libelf/ChangeLog
576=================================================================== 615index 3b88d03..cb6cad5 100644
577--- elfutils-0.159.orig/libelf/ChangeLog 616--- a/libelf/ChangeLog
578+++ elfutils-0.159/libelf/ChangeLog 617+++ b/libelf/ChangeLog
579@@ -135,6 +135,11 @@ 618@@ -244,6 +244,11 @@
580 619
581 * elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check. 620 * elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
582 621
@@ -588,7 +627,7 @@ Index: elfutils-0.159/libelf/ChangeLog
588 2011-02-26 Mark Wielaard <mjw@redhat.com> 627 2011-02-26 Mark Wielaard <mjw@redhat.com>
589 628
590 * elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini. 629 * elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
591@@ -812,6 +817,11 @@ 630@@ -921,6 +926,11 @@
592 631
593 * elf.h: Update from glibc. 632 * elf.h: Update from glibc.
594 633
@@ -600,10 +639,10 @@ Index: elfutils-0.159/libelf/ChangeLog
600 2005-05-08 Roland McGrath <roland@redhat.com> 639 2005-05-08 Roland McGrath <roland@redhat.com>
601 640
602 * elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now. 641 * elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
603Index: elfutils-0.159/libelf/common.h 642diff --git a/libelf/common.h b/libelf/common.h
604=================================================================== 643index 744f1bb..185ea59 100644
605--- elfutils-0.159.orig/libelf/common.h 644--- a/libelf/common.h
606+++ elfutils-0.159/libelf/common.h 645+++ b/libelf/common.h
607@@ -139,7 +139,7 @@ libelf_release_all (Elf *elf) 646@@ -139,7 +139,7 @@ libelf_release_all (Elf *elf)
608 (Var) = (sizeof (Var) == 1 \ 647 (Var) = (sizeof (Var) == 1 \
609 ? (unsigned char) (Var) \ 648 ? (unsigned char) (Var) \
@@ -622,10 +661,10 @@ Index: elfutils-0.159/libelf/common.h
622 : (sizeof (Var) == 4 \ 661 : (sizeof (Var) == 4 \
623 ? bswap_32 (Var) \ 662 ? bswap_32 (Var) \
624 : bswap_64 (Var)))) 663 : bswap_64 (Var))))
625Index: elfutils-0.159/libelf/gnuhash_xlate.h 664diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h
626=================================================================== 665index 04d9ca1..3e25936 100644
627--- elfutils-0.159.orig/libelf/gnuhash_xlate.h 666--- a/libelf/gnuhash_xlate.h
628+++ elfutils-0.159/libelf/gnuhash_xlate.h 667+++ b/libelf/gnuhash_xlate.h
629@@ -1,5 +1,5 @@ 668@@ -1,5 +1,5 @@
630 /* Conversion functions for versioning information. 669 /* Conversion functions for versioning information.
631- Copyright (C) 2006, 2007 Red Hat, Inc. 670- Copyright (C) 2006, 2007 Red Hat, Inc.
@@ -633,7 +672,7 @@ Index: elfutils-0.159/libelf/gnuhash_xlate.h
633 This file is part of elfutils. 672 This file is part of elfutils.
634 Written by Ulrich Drepper <drepper@redhat.com>, 2006. 673 Written by Ulrich Drepper <drepper@redhat.com>, 2006.
635 674
636@@ -68,7 +68,9 @@ elf_cvt_gnuhash (void *dest, const void 675@@ -69,7 +69,9 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode)
637 dest32 = (Elf32_Word *) &dest64[bitmask_words]; 676 dest32 = (Elf32_Word *) &dest64[bitmask_words];
638 while (len >= 4) 677 while (len >= 4)
639 { 678 {
@@ -644,28 +683,11 @@ Index: elfutils-0.159/libelf/gnuhash_xlate.h
644 len -= 4; 683 len -= 4;
645 } 684 }
646 } 685 }
647Index: elfutils-0.159/src/addr2line.c 686diff --git a/src/ChangeLog b/src/ChangeLog
648=================================================================== 687index 0ae863e..1162f6e 100644
649--- elfutils-0.159.orig/src/addr2line.c 688--- a/src/ChangeLog
650+++ elfutils-0.159/src/addr2line.c 689+++ b/src/ChangeLog
651@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl 690@@ -1371,8 +1371,16 @@
652 bool parsed = false;
653 int i, j;
654 char *name = NULL;
655- if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
656+ if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
657 && string[i] == '\0')
658 parsed = adjust_to_section (name, &addr, dwfl);
659- switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
660+ switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
661 {
662 default:
663 break;
664Index: elfutils-0.159/src/ChangeLog
665===================================================================
666--- elfutils-0.159.orig/src/ChangeLog
667+++ elfutils-0.159/src/ChangeLog
668@@ -1112,8 +1112,16 @@
669 * readelf.c (attr_callback): Use print_block only when we don't use 691 * readelf.c (attr_callback): Use print_block only when we don't use
670 print_ops. 692 print_ops.
671 693
@@ -682,7 +704,7 @@ Index: elfutils-0.159/src/ChangeLog
682 * ar.c (do_oper_extract): Use pathconf instead of statfs. 704 * ar.c (do_oper_extract): Use pathconf instead of statfs.
683 705
684 2009-08-01 Ulrich Drepper <drepper@redhat.com> 706 2009-08-01 Ulrich Drepper <drepper@redhat.com>
685@@ -1277,6 +1285,8 @@ 707@@ -1536,6 +1544,8 @@
686 * readelf.c (print_debug_frame_section): Use t instead of j formats 708 * readelf.c (print_debug_frame_section): Use t instead of j formats
687 for ptrdiff_t OFFSET. 709 for ptrdiff_t OFFSET.
688 710
@@ -691,7 +713,7 @@ Index: elfutils-0.159/src/ChangeLog
691 2009-01-21 Ulrich Drepper <drepper@redhat.com> 713 2009-01-21 Ulrich Drepper <drepper@redhat.com>
692 714
693 * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section 715 * elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
694@@ -1460,6 +1470,11 @@ 716@@ -1719,6 +1729,11 @@
695 that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really 717 that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really
696 is valid in RELRO. 718 is valid in RELRO.
697 719
@@ -703,7 +725,7 @@ Index: elfutils-0.159/src/ChangeLog
703 2008-02-29 Roland McGrath <roland@redhat.com> 725 2008-02-29 Roland McGrath <roland@redhat.com>
704 726
705 * readelf.c (print_attributes): Add a cast. 727 * readelf.c (print_attributes): Add a cast.
706@@ -1711,6 +1726,8 @@ 728@@ -1970,6 +1985,8 @@
707 729
708 * readelf.c (hex_dump): Fix rounding error in whitespace calculation. 730 * readelf.c (hex_dump): Fix rounding error in whitespace calculation.
709 731
@@ -712,7 +734,7 @@ Index: elfutils-0.159/src/ChangeLog
712 2007-10-15 Roland McGrath <roland@redhat.com> 734 2007-10-15 Roland McGrath <roland@redhat.com>
713 735
714 * make-debug-archive.in: New file. 736 * make-debug-archive.in: New file.
715@@ -2150,6 +2167,10 @@ 737@@ -2409,6 +2426,10 @@
716 * elflint.c (valid_e_machine): Add EM_ALPHA. 738 * elflint.c (valid_e_machine): Add EM_ALPHA.
717 Reported by Christian Aichinger <Greek0@gmx.net>. 739 Reported by Christian Aichinger <Greek0@gmx.net>.
718 740
@@ -723,7 +745,7 @@ Index: elfutils-0.159/src/ChangeLog
723 2006-08-08 Ulrich Drepper <drepper@redhat.com> 745 2006-08-08 Ulrich Drepper <drepper@redhat.com>
724 746
725 * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB. 747 * elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
726@@ -2226,6 +2247,10 @@ 748@@ -2485,6 +2506,10 @@
727 * Makefile.am: Add hacks to create dependency files for non-generic 749 * Makefile.am: Add hacks to create dependency files for non-generic
728 linker. 750 linker.
729 751
@@ -734,7 +756,7 @@ Index: elfutils-0.159/src/ChangeLog
734 2006-06-12 Ulrich Drepper <drepper@redhat.com> 756 2006-06-12 Ulrich Drepper <drepper@redhat.com>
735 757
736 * ldgeneric.c (ld_generic_generate_sections): Don't create .interp 758 * ldgeneric.c (ld_generic_generate_sections): Don't create .interp
737@@ -2574,6 +2599,11 @@ 759@@ -2833,6 +2858,11 @@
738 * readelf.c (print_debug_loc_section): Fix indentation for larger 760 * readelf.c (print_debug_loc_section): Fix indentation for larger
739 address size. 761 address size.
740 762
@@ -746,11 +768,44 @@ Index: elfutils-0.159/src/ChangeLog
746 2005-05-30 Roland McGrath <roland@redhat.com> 768 2005-05-30 Roland McGrath <roland@redhat.com>
747 769
748 * readelf.c (print_debug_line_section): Print section offset of each 770 * readelf.c (print_debug_line_section): Print section offset of each
749Index: elfutils-0.159/src/findtextrel.c 771diff --git a/src/Makefile.am b/src/Makefile.am
750=================================================================== 772index 4f198da..a612cf6 100644
751--- elfutils-0.159.orig/src/findtextrel.c 773--- a/src/Makefile.am
752+++ elfutils-0.159/src/findtextrel.c 774+++ b/src/Makefile.am
753@@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void * 775@@ -89,6 +89,11 @@ endif
776 # XXX While the file is not finished, don't warn about this
777 ldgeneric_no_Wunused = yes
778
779+# Buggy old compilers or libc headers.
780+readelf_no_Werror = yes
781+strings_no_Werror = yes
782+addr2line_no_Wformat = yes
783+
784 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
785 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
786 $(demanglelib)
787diff --git a/src/addr2line.c b/src/addr2line.c
788index de80294..e982982 100644
789--- a/src/addr2line.c
790+++ b/src/addr2line.c
791@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl *dwfl)
792 bool parsed = false;
793 int i, j;
794 char *name = NULL;
795- if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
796+ if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
797 && string[i] == '\0')
798 parsed = adjust_to_section (name, &addr, dwfl);
799- switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
800+ switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
801 {
802 default:
803 break;
804diff --git a/src/findtextrel.c b/src/findtextrel.c
805index 264a06b..d7de202 100644
806--- a/src/findtextrel.c
807+++ b/src/findtextrel.c
808@@ -502,7 +502,11 @@ ptrcompare (const void *p1, const void *p2)
754 809
755 810
756 static void 811 static void
@@ -763,10 +818,10 @@ Index: elfutils-0.159/src/findtextrel.c
763 GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw, 818 GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
764 const char *fname, bool more_than_one, void **knownsrcs) 819 const char *fname, bool more_than_one, void **knownsrcs)
765 { 820 {
766Index: elfutils-0.159/src/ld.h 821diff --git a/src/ld.h b/src/ld.h
767=================================================================== 822index 29f4031..8695c31 100644
768--- elfutils-0.159.orig/src/ld.h 823--- a/src/ld.h
769+++ elfutils-0.159/src/ld.h 824+++ b/src/ld.h
770@@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void); 825@@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void);
771 826
772 /* Checked whether the symbol is undefined and referenced from a DSO. */ 827 /* Checked whether the symbol is undefined and referenced from a DSO. */
@@ -775,34 +830,18 @@ Index: elfutils-0.159/src/ld.h
775 #ifdef __GNUC_STDC_INLINE__ 830 #ifdef __GNUC_STDC_INLINE__
776 __attribute__ ((__gnu_inline__)) 831 __attribute__ ((__gnu_inline__))
777 #endif 832 #endif
778@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scnin 833@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scninfo, size_t symidx)
779 834
780 return sym->defined && sym->in_dso; 835 return sym->defined && sym->in_dso;
781 } 836 }
782+#endif /* Optimizing and not GCC 4.2. */ 837+#endif /* Optimizing and not GCC 4.2. */
783 838
784 #endif /* ld.h */ 839 #endif /* ld.h */
785Index: elfutils-0.159/src/Makefile.am 840diff --git a/src/readelf.c b/src/readelf.c
786=================================================================== 841index d49544f..15dbe62 100644
787--- elfutils-0.159.orig/src/Makefile.am 842--- a/src/readelf.c
788+++ elfutils-0.159/src/Makefile.am 843+++ b/src/readelf.c
789@@ -89,6 +89,11 @@ endif 844@@ -4368,10 +4368,12 @@ listptr_base (struct listptr *p)
790 # XXX While the file is not finished, don't warn about this
791 ldgeneric_no_Wunused = yes
792
793+# Buggy old compilers or libc headers.
794+readelf_no_Werror = yes
795+strings_no_Werror = yes
796+addr2line_no_Wformat = yes
797+
798 readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
799 nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
800 $(demanglelib)
801Index: elfutils-0.159/src/readelf.c
802===================================================================
803--- elfutils-0.159.orig/src/readelf.c
804+++ elfutils-0.159/src/readelf.c
805@@ -4239,10 +4239,12 @@ listptr_base (struct listptr *p)
806 return base; 845 return base;
807 } 846 }
808 847
@@ -817,7 +856,7 @@ Index: elfutils-0.159/src/readelf.c
817 struct listptr *p1 = (void *) a; 856 struct listptr *p1 = (void *) a;
818 struct listptr *p2 = (void *) b; 857 struct listptr *p2 = (void *) b;
819 858
820@@ -4331,8 +4333,11 @@ static void 859@@ -4467,8 +4469,11 @@ static void
821 sort_listptr (struct listptr_table *table, const char *name) 860 sort_listptr (struct listptr_table *table, const char *name)
822 { 861 {
823 if (table->n > 0) 862 if (table->n > 0)
@@ -831,7 +870,7 @@ Index: elfutils-0.159/src/readelf.c
831 } 870 }
832 871
833 static bool 872 static bool
834@@ -9252,7 +9257,7 @@ dump_archive_index (Elf *elf, const char 873@@ -9540,7 +9545,7 @@ dump_archive_index (Elf *elf, const char *fname)
835 if (unlikely (elf_rand (elf, as_off) == 0) 874 if (unlikely (elf_rand (elf, as_off) == 0)
836 || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf)) 875 || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
837 == NULL)) 876 == NULL))
@@ -840,10 +879,10 @@ Index: elfutils-0.159/src/readelf.c
840 while (1) 879 while (1)
841 #endif 880 #endif
842 error (EXIT_FAILURE, 0, 881 error (EXIT_FAILURE, 0,
843Index: elfutils-0.159/src/strings.c 882diff --git a/src/strings.c b/src/strings.c
844=================================================================== 883index f60e4b4..dae6ab2 100644
845--- elfutils-0.159.orig/src/strings.c 884--- a/src/strings.c
846+++ elfutils-0.159/src/strings.c 885+++ b/src/strings.c
847@@ -43,6 +43,10 @@ 886@@ -43,6 +43,10 @@
848 887
849 #include <system.h> 888 #include <system.h>
@@ -855,7 +894,7 @@ Index: elfutils-0.159/src/strings.c
855 894
856 /* Prototypes of local functions. */ 895 /* Prototypes of local functions. */
857 static int read_fd (int fd, const char *fname, off64_t fdlen); 896 static int read_fd (int fd, const char *fname, off64_t fdlen);
858@@ -489,8 +493,13 @@ map_file (int fd, off64_t start_off, off 897@@ -489,8 +493,13 @@ map_file (int fd, off64_t start_off, off64_t fdlen, size_t *map_sizep)
859 fd, start_off); 898 fd, start_off);
860 if (mem != MAP_FAILED) 899 if (mem != MAP_FAILED)
861 { 900 {
@@ -869,7 +908,7 @@ Index: elfutils-0.159/src/strings.c
869 break; 908 break;
870 } 909 }
871 if (errno != EINVAL && errno != ENOMEM) 910 if (errno != EINVAL && errno != ENOMEM)
872@@ -581,9 +590,11 @@ read_block (int fd, const char *fname, o 911@@ -581,9 +590,11 @@ read_block (int fd, const char *fname, off64_t fdlen, off64_t from, off64_t to)
873 elfmap_off = from & ~(ps - 1); 912 elfmap_off = from & ~(ps - 1);
874 elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size); 913 elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
875 914
@@ -881,10 +920,10 @@ Index: elfutils-0.159/src/strings.c
881 } 920 }
882 921
883 if (unlikely (elfmap == MAP_FAILED)) 922 if (unlikely (elfmap == MAP_FAILED))
884Index: elfutils-0.159/src/strip.c 923diff --git a/src/strip.c b/src/strip.c
885=================================================================== 924index 2b21799..1b34eee 100644
886--- elfutils-0.159.orig/src/strip.c 925--- a/src/strip.c
887+++ elfutils-0.159/src/strip.c 926+++ b/src/strip.c
888@@ -45,6 +45,12 @@ 927@@ -45,6 +45,12 @@
889 #include <libebl.h> 928 #include <libebl.h>
890 #include <system.h> 929 #include <system.h>
@@ -917,7 +956,7 @@ Index: elfutils-0.159/src/strip.c
917 } 956 }
918 957
919 /* Open the file. */ 958 /* Open the file. */
920@@ -2086,7 +2102,7 @@ while computing checksum for debug infor 959@@ -2091,7 +2107,7 @@ while computing checksum for debug information"));
921 /* If requested, preserve the timestamp. */ 960 /* If requested, preserve the timestamp. */
922 if (tvp != NULL) 961 if (tvp != NULL)
923 { 962 {
@@ -926,7 +965,7 @@ Index: elfutils-0.159/src/strip.c
926 { 965 {
927 error (0, errno, gettext ("\ 966 error (0, errno, gettext ("\
928 cannot set access and modification date of '%s'"), 967 cannot set access and modification date of '%s'"),
929@@ -2143,7 +2159,7 @@ handle_ar (int fd, Elf *elf, const char 968@@ -2148,7 +2164,7 @@ handle_ar (int fd, Elf *elf, const char *prefix, const char *fname,
930 969
931 if (tvp != NULL) 970 if (tvp != NULL)
932 { 971 {
@@ -935,23 +974,11 @@ Index: elfutils-0.159/src/strip.c
935 { 974 {
936 error (0, errno, gettext ("\ 975 error (0, errno, gettext ("\
937 cannot set access and modification date of '%s'"), fname); 976 cannot set access and modification date of '%s'"), fname);
938Index: elfutils-0.159/tests/backtrace.c 977diff --git a/tests/ChangeLog b/tests/ChangeLog
939=================================================================== 978index 59048f6..02eccfc 100644
940--- elfutils-0.159.orig/tests/backtrace.c 979--- a/tests/ChangeLog
941+++ elfutils-0.159/tests/backtrace.c 980+++ b/tests/ChangeLog
942@@ -36,6 +36,7 @@ 981@@ -421,6 +421,13 @@
943 #include <fcntl.h>
944 #include <string.h>
945 #include <argp.h>
946+#include <sys/syscall.h>
947 #include ELFUTILS_HEADER(dwfl)
948
949 #ifndef __linux__
950Index: elfutils-0.159/tests/ChangeLog
951===================================================================
952--- elfutils-0.159.orig/tests/ChangeLog
953+++ elfutils-0.159/tests/ChangeLog
954@@ -283,6 +283,13 @@
955 982
956 2013-12-02 Jan Kratochvil <jan.kratochvil@redhat.com> 983 2013-12-02 Jan Kratochvil <jan.kratochvil@redhat.com>
957 984
@@ -965,7 +992,7 @@ Index: elfutils-0.159/tests/ChangeLog
965 * Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child, 992 * Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child,
966 backtrace-data and backtrace-dwarf. 993 backtrace-data and backtrace-dwarf.
967 (BUILT_SOURCES, clean-local, backtrace-child-biarch): New. 994 (BUILT_SOURCES, clean-local, backtrace-child-biarch): New.
968@@ -1147,6 +1154,8 @@ 995@@ -1285,6 +1292,8 @@
969 996
970 2008-01-21 Roland McGrath <roland@redhat.com> 997 2008-01-21 Roland McGrath <roland@redhat.com>
971 998
@@ -974,7 +1001,7 @@ Index: elfutils-0.159/tests/ChangeLog
974 * testfile45.S.bz2: Add tests for cltq, cqto. 1001 * testfile45.S.bz2: Add tests for cltq, cqto.
975 * testfile45.expect.bz2: Adjust. 1002 * testfile45.expect.bz2: Adjust.
976 1003
977@@ -1855,6 +1864,11 @@ 1004@@ -1993,6 +2002,11 @@
978 * Makefile.am (TESTS): Add run-elflint-test.sh. 1005 * Makefile.am (TESTS): Add run-elflint-test.sh.
979 (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. 1006 (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
980 1007
@@ -986,10 +1013,34 @@ Index: elfutils-0.159/tests/ChangeLog
986 2005-05-24 Ulrich Drepper <drepper@redhat.com> 1013 2005-05-24 Ulrich Drepper <drepper@redhat.com>
987 1014
988 * get-files.c (main): Use correct format specifier. 1015 * get-files.c (main): Use correct format specifier.
989Index: elfutils-0.159/tests/line2addr.c 1016diff --git a/tests/Makefile.am b/tests/Makefile.am
990=================================================================== 1017index f32e4d0..2652fb8 100644
991--- elfutils-0.159.orig/tests/line2addr.c 1018--- a/tests/Makefile.am
992+++ elfutils-0.159/tests/line2addr.c 1019+++ b/tests/Makefile.am
1020@@ -365,6 +365,7 @@ get_lines_LDADD = $(libdw) $(libelf)
1021 get_files_LDADD = $(libdw) $(libelf)
1022 get_aranges_LDADD = $(libdw) $(libelf)
1023 allfcts_LDADD = $(libdw) $(libelf)
1024+line2addr_no_Wformat = yes
1025 line2addr_LDADD = $(libdw)
1026 addrscopes_LDADD = $(libdw)
1027 funcscopes_LDADD = $(libdw)
1028diff --git a/tests/backtrace.c b/tests/backtrace.c
1029index 331ba0f..46af9b5 100644
1030--- a/tests/backtrace.c
1031+++ b/tests/backtrace.c
1032@@ -36,6 +36,7 @@
1033 #include <fcntl.h>
1034 #include <string.h>
1035 #include <argp.h>
1036+#include <sys/syscall.h>
1037 #include ELFUTILS_HEADER(dwfl)
1038
1039 #ifndef __linux__
1040diff --git a/tests/line2addr.c b/tests/line2addr.c
1041index e0d65d3..7c171b9 100644
1042--- a/tests/line2addr.c
1043+++ b/tests/line2addr.c
993@@ -124,7 +124,7 @@ main (int argc, char *argv[]) 1044@@ -124,7 +124,7 @@ main (int argc, char *argv[])
994 { 1045 {
995 struct args a = { .arg = argv[cnt] }; 1046 struct args a = { .arg = argv[cnt] };
@@ -999,15 +1050,6 @@ Index: elfutils-0.159/tests/line2addr.c
999 { 1050 {
1000 default: 1051 default:
1001 case 0: 1052 case 0:
1002Index: elfutils-0.159/tests/Makefile.am 1053--
1003=================================================================== 10541.9.1
1004--- elfutils-0.159.orig/tests/Makefile.am 1055
1005+++ elfutils-0.159/tests/Makefile.am
1006@@ -356,6 +356,7 @@ get_lines_LDADD = $(libdw) $(libelf)
1007 get_files_LDADD = $(libdw) $(libelf)
1008 get_aranges_LDADD = $(libdw) $(libelf)
1009 allfcts_LDADD = $(libdw) $(libelf)
1010+line2addr_no_Wformat = yes
1011 line2addr_LDADD = $(libdw)
1012 addrscopes_LDADD = $(libdw)
1013 funcscopes_LDADD = $(libdw)
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/scanf-format.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/scanf-format.patch
index c08519cf53..c08519cf53 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/scanf-format.patch
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/scanf-format.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/testsuite-ignore-elflint.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/testsuite-ignore-elflint.diff
index eae5796de3..eae5796de3 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/testsuite-ignore-elflint.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/testsuite-ignore-elflint.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.160.bb b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
index e02918e94a..a3c1f36f6a 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.160.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
@@ -7,8 +7,8 @@ DEPENDS = "libtool bzip2 zlib virtual/libintl"
7 7
8SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/${PV}/elfutils-${PV}.tar.bz2" 8SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/${PV}/elfutils-${PV}.tar.bz2"
9 9
10SRC_URI[md5sum] = "7527f22dff8b1ac8c122cfc4d3d3bb1e" 10SRC_URI[md5sum] = "e1b9847c9a6a1ad340de8d47a863ec52"
11SRC_URI[sha256sum] = "741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1" 11SRC_URI[sha256sum] = "570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070"
12 12
13SRC_URI += "\ 13SRC_URI += "\
14 file://mempcpy.patch \ 14 file://mempcpy.patch \