File kdumpid-binutils-2.39-fix.patch of Package kdumpid

Overview Repositories Revisions Requests Users Attributes Meta

File kdumpid-binutils-2.39-fix.patch of Package kdumpid (Revision f6f0412cdef3bb20a5e6d74cf169e126)

Currently displaying revision f6f0412cdef3bb20a5e6d74cf169e126 , Show latest

From: Petr Tesarik <ptesarik@suse.com>
Date: Tue Aug 16 11:09:11 2022 +0200
Subject: Fix build with binutils-2.39
Upstream: yes
Git-commit: beb8ea652e0cd313be781cf16b9f378715fe15fd

binutils commit 60a3da00bd5407f07d64dff82a4dae98230dfaac added a
new parameter to init_disassemble_info().

Check this change at build time. Note that this is the kind of
check that GNU Autoconf was invented for, but let's try to keep
this dinosaur away from this project for some more more.

Signed-off-by: Petr Tesarik <ptesarik@suse.com>

diff --git a/Makefile b/Makefile
index 0bc4f65..b44dc88 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,9 @@ COMPRESS=bzip2 -9
 VER_MAJOR=1
 VER_MINOR=3
 
-CFLAGS=-DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR)
+CDEFS:=$(shell ./cdefs.sh)
+
+CFLAGS=-DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR) $(CDEFS)
 
 ifndef INSTALL
 INSTALL=/usr/bin/install
diff --git a/cdefs.sh b/cdefs.sh
new file mode 100755
index 0000000..c2d3de6
--- /dev/null
+++ b/cdefs.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+tmpdir=$(mktemp -d)
+trap 'rm -rf "$tmpdir"' EXIT
+cd "$tmpdir"
+
+cat > dis_asm.c <<EOF
+#include <dis-asm.h>
+void fn(struct disassemble_info *info, void *stream,
+        fprintf_ftype fprintf_func, fprintf_styled_ftype fprintf_styled_func)
+{
+  init_disassemble_info(info, stream, fprintf_func, fprintf_styled_func);
+}
+EOF
+if make dis_asm.o &> /dev/null
+then
+    echo "-DDIS_ASM_STYLED_PRINTF"
+fi
diff --git a/ppc.c b/ppc.c
index 4a321c4..8d460ae 100644
--- a/ppc.c
+++ b/ppc.c
@@ -66,6 +66,23 @@ disas_fn(void *data, const char *fmt, ...)
 	return 0;
 }
 
+#ifdef DIS_ASM_STYLED_PRINTF
+
+static int
+disas_styled_fn(void *data, enum disassembler_style style,
+		const char *fmt, ...)
+{
+	va_list va;
+
+	va_start(va, fmt);
+	append_insn(data, fmt, va);
+	va_end(va);
+
+	return 0;
+}
+
+#endif	/* DIS_ASM_STYLED_PRINTF */
+
 static void error_func(int status, bfd_vma memaddr,
 		       struct disassemble_info *dinfo)
 {
@@ -123,7 +140,11 @@ looks_like_kcode_ppc(struct dump_desc *dd, uint64_t addr)
 		return -1;
 
 	memset(&priv, 0, sizeof priv);
+#ifdef DIS_ASM_STYLED_PRINTF
+	init_disassemble_info(&info, &priv, disas_fn, disas_styled_fn);
+#else
 	init_disassemble_info(&info, &priv, disas_fn);
+#endif
 	info.memory_error_func = error_func;
 	info.buffer        = dd->page;
 	info.buffer_vma    = addr;
diff --git a/ppc64.c b/ppc64.c
index 1542b80..67a912f 100644
--- a/ppc64.c
+++ b/ppc64.c
@@ -65,6 +65,23 @@ disas_fn(void *data, const char *fmt, ...)
 	return 0;
 }
 
+#ifdef DIS_ASM_STYLED_PRINTF
+
+static int
+disas_styled_fn(void *data, enum disassembler_style style,
+		const char *fmt, ...)
+{
+	va_list va;
+
+	va_start(va, fmt);
+	append_insn(data, fmt, va);
+	va_end(va);
+
+	return 0;
+}
+
+#endif	/* DIS_ASM_STYLED_PRINTF */
+
 static void
 print_address(bfd_vma addr, struct disassemble_info *info)
 {
@@ -138,7 +155,11 @@ looks_like_kcode_ppc64(struct dump_desc *dd, uint64_t addr)
 		return -1;
 
 	memset(&priv, 0, sizeof priv);
+#ifdef DIS_ASM_STYLED_PRINTF
+	init_disassemble_info(&info, &priv, disas_fn, disas_styled_fn);
+#else
 	init_disassemble_info(&info, &priv, disas_fn);
+#endif
 	info.print_address_func = print_address;
 	info.memory_error_func = error_func;
 	info.buffer        = dd->page;
diff --git a/s390.c b/s390.c
index 15db888..fdd23f7 100644
--- a/s390.c
+++ b/s390.c
@@ -70,6 +70,23 @@ disas_fn(void *data, const char *fmt, ...)
 	return 0;
 }
 
+#ifdef DIS_ASM_STYLED_PRINTF
+
+static int
+disas_styled_fn(void *data, enum disassembler_style style,
+		const char *fmt, ...)
+{
+	va_list va;
+
+	va_start(va, fmt);
+	append_insn(data, fmt, va);
+	va_end(va);
+
+	return 0;
+}
+
+#endif	/* DIS_ASM_STYLED_PRINTF */
+
 static void error_func(int status, bfd_vma memaddr,
 		       struct disassemble_info *dinfo)
 {
@@ -128,7 +145,11 @@ looks_like_kcode_s390(struct dump_desc *dd, uint64_t addr)
 		return -1;
 
 	memset(&priv, 0, sizeof priv);
+#ifdef DIS_ASM_STYLED_PRINTF
+	init_disassemble_info(&info, &priv, disas_fn, disas_styled_fn);
+#else
 	init_disassemble_info(&info, &priv, disas_fn);
+#endif
 	info.memory_error_func = error_func;
 	info.buffer        = dd->page;
 	info.buffer_vma    = addr + DEFAULT_LOAD_ADDR;
diff --git a/x86.c b/x86.c
index 0f69c76..5c72bbb 100644
--- a/x86.c
+++ b/x86.c
@@ -62,6 +62,23 @@ disas_fn(void *data, const char *fmt, ...)
 	return 0;
 }
 
+#ifdef DIS_ASM_STYLED_PRINTF
+
+static int
+disas_styled_fn(void *data, enum disassembler_style style,
+		const char *fmt, ...)
+{
+	va_list va;
+
+	va_start(va, fmt);
+	append_insn(data, fmt, va);
+	va_end(va);
+
+	return 0;
+}
+
+#endif	/* DIS_ASM_STYLED_PRINTF */
+
 static void error_func(int status, bfd_vma memaddr,
 		       struct disassemble_info *dinfo)
 {
@@ -255,7 +272,11 @@ looks_like_kcode_x86(struct dump_desc *dd, uint64_t addr)
 	if (!priv)
 		return -1;
 
+#ifdef DIS_ASM_STYLED_PRINTF
+	init_disassemble_info(&info, priv, disas_fn, disas_styled_fn);
+#else
 	init_disassemble_info(&info, priv, disas_fn);
+#endif
 	info.memory_error_func = error_func;
 	info.buffer        = dd->page;
 	info.buffer_vma    = addr;

Places

File kdumpid-binutils-2.39-fix.patch of Package kdumpid (Revision f6f0412cdef3bb20a5e6d74cf169e126)

Places