[packages/kernel-tools] - up to 4.13.11 - fix building with binutils 2.29

[baggins]

commit ea7d139b321acb52c3483274125e2281318126c7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 3 23:41:43 2017 +0100

    - up to 4.13.11
    - fix building with binutils 2.29

 binutils-2.29.patch | 11 +++++++++++
 kernel-tools.spec   | 13 ++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/kernel-tools.spec b/kernel-tools.spec
index e6c61ad..29777c4 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -21,7 +21,7 @@
 %endif
 
 %define		basever		4.13
-%define		postver		.9
+%define		postver		.11
 Summary:	Assortment of tools for the Linux kernel
 Summary(pl.UTF-8):	Zestaw narzędzi dla jądra Linuksa
 Name:		kernel-tools
@@ -35,11 +35,12 @@ Source1:	cpupower.service
 Source2:	cpupower.config
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	65ff24fbf4cbfff46af62393ddc901d9
+# Patch0-md5:	f03030893fae6a5620ba1056a9e3b931
 %endif
 Patch1:		x32.patch
 Patch2:		%{name}-lguest-update.patch
 Patch3:		%{name}-perf-update.patch
+Patch4:		binutils-2.29.patch
 URL:		http://www.kernel.org/
 BuildRequires:	bison
 BuildRequires:	flex
@@ -54,7 +55,7 @@ BuildRequires:	xz
 %if %{with perf}
 BuildRequires:	asciidoc
 BuildRequires:	audit-libs-devel
-BuildRequires:	binutils-devel
+BuildRequires:	binutils-devel >= 4:2.29
 BuildRequires:	docbook-dtd45-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	elfutils-devel
@@ -358,6 +359,7 @@ cd linux-%{basever}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__sed} -i -e '/^CFLAGS = /s/ -g / $(OPTFLAGS) /' tools/hv/Makefile
 %{__sed} -i -e '/^CFLAGS+=/s/ -O1 / $(OPTFLAGS) /' tools/thermal/tmon/Makefile
@@ -447,9 +449,10 @@ CFLAGS="%{rpmcflags}" \
 %endif
 
 %ifarch %{ix86} %{x8664} x32
+CFLAGS="%{rpmcflags}" \
 %{__make} -C tools/power/x86/x86_energy_perf_policy \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+	CC="%{__cc}"
+
 CFLAGS="%{rpmcflags}" \
 %{__make} -C tools/power/x86/turbostat \
 	CC="%{__cc}"
diff --git a/binutils-2.29.patch b/binutils-2.29.patch
new file mode 100644
index 0000000..fce01d4
--- /dev/null
+++ b/binutils-2.29.patch
@@ -0,0 +1,11 @@
+--- linux-4.13/tools/net/bpf_jit_disasm.c.orig	2017-09-03 22:56:17.000000000 +0200
++++ linux-4.13/tools/net/bpf_jit_disasm.c	2017-11-03 22:34:58.128950311 +0100
+@@ -71,7 +71,7 @@
+ 
+ 	disassemble_init_for_target(&info);
+ 
+-	disassemble = disassembler(bfdf);
++	disassemble = disassembler(info.arch, bfd_big_endian(bfdf), info.mach, bfdf);
+ 	assert(disassemble);
+ 
+ 	do {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel-tools.git/commitdiff/ea7d139b321acb52c3483274125e2281318126c7