bc7322fe54
All patch from gdb 10.2 are kept. Starting from version 11.x, gdb needs the gmp library. The target variant needs a bit of care: if BR2_GDB_VERSION_11 is not set, either the host gdb is not enabled, in which case the default for the target gdb is 9.x, or the host gdb is enabled, and another version is selected. Signed-off-by: Michael Fischer <mf@go-sys.de> [Thomas: - fix how the gmp dependency is handled - set BR2_PACKAGE_GDB_TOPLEVEL to y for gdb 11.x - fix how BR2_GDB_VERSION is set for gdb 11.x] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> [yann.morin.1998@free.fr: - only select target gmp if using gdb 11 ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From c8454711eca2e79437e17ed1e1e68b48b4c8d927 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
Date: Sun, 24 Jun 2018 23:33:55 +0200
|
|
Subject: [PATCH] nat/fork-inferior: include linux-ptrace.h
|
|
|
|
To decide whether fork() or vfork() should be used, fork-inferior.c
|
|
uses the following test:
|
|
|
|
#if !(defined(__UCLIBC__) && defined(HAS_NOMMU))
|
|
|
|
However, HAS_NOMMU is never defined, because it gets defined in
|
|
linux-ptrace.h, which is not included by fork-inferior.c. Due to this,
|
|
gdbserver fails to build on noMMU architectures. This commit fixes
|
|
that by simply including linux-ptrace.h.
|
|
|
|
This bug was introduced by commit
|
|
2090129c36c7e582943b7d300968d19b46160d84 ("Share fork_inferior et al
|
|
with gdbserver"). Indeed, the same fork()/vfork() selection was done,
|
|
but in another file where linux-ptrace.h was included.
|
|
|
|
Fixes the following build issue:
|
|
|
|
../nat/fork-inferior.c: In function 'pid_t fork_inferior(const char*, const string&, char**, void (*)(), void (*)(int), void (*)(), const char*, void (*)(const char*, char* const*, char* const*))':
|
|
../nat/fork-inferior.c:376:11: error: 'fork' was not declared in this scope
|
|
pid = fork ();
|
|
^~~~
|
|
../nat/fork-inferior.c:376:11: note: suggested alternative: 'vfork'
|
|
pid = fork ();
|
|
^~~~
|
|
vfork
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
[Romain: rebase on gdb 8.3]
|
|
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
---
|
|
gdb/nat/fork-inferior.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c
|
|
index 7ba0126871d..53e1ec72f09 100644
|
|
--- a/gdb/nat/fork-inferior.c
|
|
+++ b/gdb/nat/fork-inferior.c
|
|
@@ -27,6 +27,7 @@
|
|
#include "gdbsupport/pathstuff.h"
|
|
#include "gdbsupport/signals-state-save-restore.h"
|
|
#include "gdbsupport/gdb_tilde_expand.h"
|
|
+#include "linux-ptrace.h"
|
|
#include <vector>
|
|
|
|
extern char **environ;
|
|
--
|
|
2.29.2
|
|
|