kumquat-buildroot/package/gdb/8.2.1/0004-gdbserver-fix-build-for-m68k.patch
Romain Naour e61c44888a package/gdb: bump to version 8.2.1
GDB 8.2.1 brings the following fixes and enhancements over GDB 8.2:

 * PR build/23516 (gdb build error under msys+mingw: strip can't handle gdb-add-index.exe)
 * PR build/23623 (install-strip fails)
 * PR rust/23626 (gdb crashes in upstream rust nil-enum test)
 * PR rust/23650 (rust field name access error mentions "foo")
 * PR gdb/23663 (gdb 8.1.1: undefined rpl_stat function with musl toolchains)
 * PR python/23669 (gdb.execute("show commands") doesn't work)
 * PR python/23714 (Command repetition stops working after gdb.execute)
 * PR gdb/23838 (8.2 regression for invalid -data-directory)
 * PR gdb/23974 ("info os" crash when specifying invalid object)
 * PR gdb/23999 (SYMBOL_LANGUAGE assertion failure on AIX)
 * PR gdb/24003 (Error when binary searching CUs for a specific DIE when using DWZ)

Remove upstream patch:

0006-Move-is_regular_file-from-common-utils.c-to-filestuf.patch
5de69bdbd0

See:
https://sourceware.org/ml/gdb-announce/2018/msg00004.html

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-12-26 21:34:10 +01:00

63 lines
1.9 KiB
Diff

From 69cbbbbbd425111428db5ae91767dae5436ba63d Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 22 Jun 2018 22:40:26 +0200
Subject: [PATCH] gdbserver: fix build for m68k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
As for strace [1], when <sys/reg.h> is included after <linux/ptrace.h>,
the build fails on m68k with the following diagnostics:
In file included from ./../nat/linux-ptrace.h:28:0,
from linux-low.h:27,
from linux-m68k-low.c:20:
[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant
PT_D1 = 0,
^
[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant
[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant
In file included from linux-m68k-low.c:27:0:
[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token
};
^
Fix this by moving <sys/reg.h> on top of "linux-low.h".
[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
gdb/gdbserver/linux-m68k-low.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c
index 5594f10f927..19b4ef7b259 100644
--- a/gdb/gdbserver/linux-m68k-low.c
+++ b/gdb/gdbserver/linux-m68k-low.c
@@ -17,16 +17,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "server.h"
+
+#ifdef HAVE_SYS_REG_H
+#include <sys/reg.h>
+#endif
+
#include "linux-low.h"
/* Defined in auto-generated file reg-m68k.c. */
void init_registers_m68k (void);
extern const struct target_desc *tdesc_m68k;
-#ifdef HAVE_SYS_REG_H
-#include <sys/reg.h>
-#endif
-
#define m68k_num_regs 29
#define m68k_num_gregs 18
--
2.14.4