initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,55 @@
|
||||
From 64b8ab56118d2fea027adfb7ebbc01668b29528e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 6 Aug 2016 17:32:50 -0700
|
||||
Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
[Rebase on gdb 8.3]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
gdb/nat/ppc-linux.h | 6 ++++++
|
||||
gdbserver/linux-ppc-low.cc | 6 ++++++
|
||||
2 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
|
||||
index d937a65b69c..1fd54b4a0e0 100644
|
||||
--- a/gdb/nat/ppc-linux.h
|
||||
+++ b/gdb/nat/ppc-linux.h
|
||||
@@ -18,7 +18,13 @@
|
||||
#ifndef NAT_PPC_LINUX_H
|
||||
#define NAT_PPC_LINUX_H
|
||||
|
||||
+#if !defined(__GLIBC__)
|
||||
+# define pt_regs uapi_pt_regs
|
||||
+#endif
|
||||
#include <asm/ptrace.h>
|
||||
+#if !defined(__GLIBC__)
|
||||
+# undef pt_regs
|
||||
+#endif
|
||||
#include <asm/cputable.h>
|
||||
|
||||
/* This sometimes isn't defined. */
|
||||
diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc
|
||||
index 337d555aee7..5d518f37268 100644
|
||||
--- a/gdbserver/linux-ppc-low.cc
|
||||
+++ b/gdbserver/linux-ppc-low.cc
|
||||
@@ -23,7 +23,13 @@
|
||||
#include "elf/common.h"
|
||||
#include <sys/uio.h>
|
||||
#include <elf.h>
|
||||
+#if !defined(__GLIBC__)
|
||||
+# define pt_regs uapi_pt_regs
|
||||
+#endif
|
||||
#include <asm/ptrace.h>
|
||||
+#if !defined(__GLIBC__)
|
||||
+# undef pt_regs
|
||||
+#endif
|
||||
|
||||
#include "arch/ppc-linux-common.h"
|
||||
#include "arch/ppc-linux-tdesc.h"
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From d205f398e1e36f9673f50f368a3f29fd1dfaa794 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sat, 3 Jun 2017 21:23:52 +0200
|
||||
Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC
|
||||
systems
|
||||
|
||||
Fixes a pt_{dsp,}regs redefinition when building with the musl C library
|
||||
on SuperH.
|
||||
|
||||
Inspired by
|
||||
http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch,
|
||||
adapted for SuperH.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
[Rebase on gdb 8.0]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
gdbserver/linux-sh-low.cc | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/gdbserver/linux-sh-low.cc b/gdbserver/linux-sh-low.cc
|
||||
index a6d3fc60047..b83cce6b9fe 100644
|
||||
--- a/gdbserver/linux-sh-low.cc
|
||||
+++ b/gdbserver/linux-sh-low.cc
|
||||
@@ -76,7 +76,15 @@ extern const struct target_desc *tdesc_sh;
|
||||
#include <sys/reg.h>
|
||||
#endif
|
||||
|
||||
+#if !defined(__GLIBC__)
|
||||
+# define pt_regs uapi_pt_regs
|
||||
+# define pt_dspregs uapi_pt_dspregs
|
||||
+#endif
|
||||
#include <asm/ptrace.h>
|
||||
+#if !defined(__GLIBC__)
|
||||
+# undef pt_regs
|
||||
+# undef pt_dspregs
|
||||
+#endif
|
||||
|
||||
#define sh_num_regs 41
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001
|
||||
From: Andre McCurdy <amccurdy@gmail.com>
|
||||
Date: Sat, 30 Apr 2016 15:29:06 -0700
|
||||
Subject: [PATCH] use <asm/sgidefs.h>
|
||||
|
||||
Build fix for MIPS with musl libc
|
||||
|
||||
The MIPS specific header <sgidefs.h> is provided by glibc and uclibc
|
||||
but not by musl. Regardless of the libc, the kernel headers provide
|
||||
<asm/sgidefs.h> which provides the same definitions, so use that
|
||||
instead.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
[Vincent:
|
||||
Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
|
||||
|
||||
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
---
|
||||
gdb/mips-linux-nat.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
|
||||
index 38ff461a35b..b6cf194b2bf 100644
|
||||
--- a/gdb/mips-linux-nat.c
|
||||
+++ b/gdb/mips-linux-nat.c
|
||||
@@ -31,7 +31,7 @@
|
||||
#include "gdb_proc_service.h"
|
||||
#include "gregset.h"
|
||||
|
||||
-#include <sgidefs.h>
|
||||
+#include <asm/sgidefs.h>
|
||||
#include "nat/gdb_ptrace.h"
|
||||
#include <asm/ptrace.h>
|
||||
#include "inf-ptrace.h"
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
From 90ebe548922538b854de52e8b687384f44360984 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>
|
||||
---
|
||||
gdbserver/linux-m68k-low.cc | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc
|
||||
index 838ba353b0b..36679682b9a 100644
|
||||
--- a/gdbserver/linux-m68k-low.cc
|
||||
+++ b/gdbserver/linux-m68k-low.cc
|
||||
@@ -17,6 +17,11 @@
|
||||
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"
|
||||
|
||||
/* Linux target op definitions for the m68k architecture. */
|
||||
@@ -80,10 +85,6 @@ m68k_target::low_decr_pc_after_break ()
|
||||
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.29.2
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
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
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
From 7b3df9b8938357c2b0dcf2624e599a76fc4edc02 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Sun, 3 Oct 2021 12:02:53 -0400
|
||||
Subject: [PATCH] sim: filter out SIGSTKSZ [PR sim/28302]
|
||||
|
||||
We map target signals to host signals so we can propagate signals
|
||||
between the host & simulated worlds. That means we need to know
|
||||
the symbolic names & values of all signals that might be sent.
|
||||
|
||||
The tools that generate that list use signal.h and include all
|
||||
symbols that start with "SIG" so as to automatically include any
|
||||
new symbols that the C library might add. Unfortunately, this
|
||||
also picks up "SIGSTKSZ" which is not actually a signal itself,
|
||||
but a signal related setting -- it's the size of the stack when
|
||||
a signal is handled.
|
||||
|
||||
By itself this doesn't super matter as we will never see a signal
|
||||
with that same value (since the range of valid signals tend to be
|
||||
way less than 1024, and the size of the default signal stack will
|
||||
never be that small). But with recent glibc changes that make this
|
||||
into a dynamic value instead of a compile-time constant, some users
|
||||
see build failures when building the sim.
|
||||
|
||||
As suggested by Adam Sampson, update our scripts to ignore this
|
||||
symbol to simplify everything and avoid the build failure.
|
||||
|
||||
Bug: https://sourceware.org/PR28302
|
||||
|
||||
[Upstream: https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=39d53d04357606a15efd400147fa7369d71baf2c]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
sim/bfin/linux-targ-map.h | 5 +----
|
||||
sim/common/gennltvals.py | 6 ++++--
|
||||
sim/common/nltvals.def | 1 -
|
||||
3 files changed, 5 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/sim/bfin/linux-targ-map.h b/sim/bfin/linux-targ-map.h
|
||||
index e9c8c8f..0340ed5 100644
|
||||
--- a/sim/bfin/linux-targ-map.h
|
||||
+++ b/sim/bfin/linux-targ-map.h
|
||||
@@ -30,6 +30,7 @@ echo
|
||||
# XXX: nothing uses this ?
|
||||
echo '#include <signal.h>' | \
|
||||
bfin-uclinux-gcc -E -dD -P - | \
|
||||
+grep -v SIGSTKSZ | \
|
||||
sed -r -n \
|
||||
-e '1istatic CB_TARGET_DEFS_MAP cb_linux_signal_map[] = {' \
|
||||
-e '$i\ \ { 0, -1, -1 }\n};' \
|
||||
@@ -1987,10 +1988,6 @@ static CB_TARGET_DEFS_MAP cb_linux_signal_map[] =
|
||||
#ifdef SIG_SETMASK
|
||||
# define TARGET_LINUX_SIG_SETMASK 2
|
||||
{ "SIG_SETMASK", SIG_SETMASK, TARGET_LINUX_SIG_SETMASK },
|
||||
-#endif
|
||||
-#ifdef SIGSTKSZ
|
||||
-# define TARGET_LINUX_SIGSTKSZ 8192
|
||||
- { "SIGSTKSZ", SIGSTKSZ, TARGET_LINUX_SIGSTKSZ },
|
||||
#endif
|
||||
{ 0, -1, -1 }
|
||||
};
|
||||
diff --git a/sim/common/gennltvals.py b/sim/common/gennltvals.py
|
||||
index b3e558d..bd4d7e9 100755
|
||||
--- a/sim/common/gennltvals.py
|
||||
+++ b/sim/common/gennltvals.py
|
||||
@@ -67,6 +67,7 @@ FILE_HEADER = f"""\
|
||||
def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path,
|
||||
headers: Iterable[str],
|
||||
pattern: str,
|
||||
+ filter: str = r'^$',
|
||||
target: str = None):
|
||||
"""Extract constants from the specified files using a regular expression.
|
||||
|
||||
@@ -94,12 +95,13 @@ def gentvals(output: TextIO, cpp: str, srctype: str, srcdir: Path,
|
||||
srcfile = ''.join(f'#include <{x}>\n' for x in headers)
|
||||
syms = set()
|
||||
define_pattern = re.compile(r'^#\s*define\s+(' + pattern + ')')
|
||||
+ filter_pattern = re.compile(filter)
|
||||
for header in headers:
|
||||
with open(srcdir / header, 'r', encoding='utf-8') as fp:
|
||||
data = fp.read()
|
||||
for line in data.splitlines():
|
||||
m = define_pattern.match(line)
|
||||
- if m:
|
||||
+ if m and not filter_pattern.search(line):
|
||||
syms.add(m.group(1))
|
||||
for sym in sorted(syms):
|
||||
srcfile += f'#ifdef {sym}\nDEFVAL {{ "{sym}", {sym} }},\n#endif\n'
|
||||
@@ -129,7 +131,7 @@ def gen_common(output: TextIO, newlib: Path, cpp: str):
|
||||
('errno.h', 'sys/errno.h'), 'E[A-Z0-9]*')
|
||||
|
||||
gentvals(output, cpp, 'signal', newlib / 'newlib/libc/include',
|
||||
- ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*')
|
||||
+ ('signal.h', 'sys/signal.h'), r'SIG[A-Z0-9]*', filter=r'SIGSTKSZ')
|
||||
|
||||
gentvals(output, cpp, 'open', newlib / 'newlib/libc/include',
|
||||
('fcntl.h', 'sys/fcntl.h', 'sys/_default_fcntl.h'), r'O_[A-Z0-9]*')
|
||||
diff --git a/sim/common/nltvals.def b/sim/common/nltvals.def
|
||||
index 8ae8839..8bc6ae5 100644
|
||||
--- a/sim/common/nltvals.def
|
||||
+++ b/sim/common/nltvals.def
|
||||
@@ -116,7 +116,6 @@
|
||||
{ "SIGPROF", 27 },
|
||||
{ "SIGQUIT", 3 },
|
||||
{ "SIGSEGV", 11 },
|
||||
- { "SIGSTKSZ", 8192 },
|
||||
{ "SIGSTOP", 17 },
|
||||
{ "SIGSYS", 12 },
|
||||
{ "SIGTERM", 15 },
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 879008ef9a48aa1363671f5c1736b49f30c5a379 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sat, 6 Nov 2021 10:06:25 +0100
|
||||
Subject: [PATCH] Fix getrandom compile for uclibc < v1.0.35
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- fix getrandom compile for uclibc < v1.0.35, add missing stddef.h
|
||||
include (fixed in uclibc since v1.0.35, see [1])
|
||||
|
||||
Fixes:
|
||||
|
||||
.../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name ‘size_t’
|
||||
27 | extern int getrandom(void *__buf, size_t count, unsigned int flags)
|
||||
| ^~~~~~
|
||||
|
||||
[1] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=00972c02c2b6e0a95d5def4a71bdfb188e091782t
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
gnulib/import/getrandom.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/gnulib/import/getrandom.c b/gnulib/import/getrandom.c
|
||||
index 41212fb..0ad3f96 100644
|
||||
--- a/gnulib/import/getrandom.c
|
||||
+++ b/gnulib/import/getrandom.c
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
+#include <stddef.h>
|
||||
#include <sys/random.h>
|
||||
|
||||
#include <errno.h>
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
From c3fdbc0a24c83246f951ba79c7167547da979ae5 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Wed, 10 Nov 2021 23:14:54 +0100
|
||||
Subject: [PATCH] fix musl build on riscv
|
||||
|
||||
Fix the following build failure raised with musl:
|
||||
|
||||
../../gdbserver/linux-riscv-low.cc: In function 'void riscv_fill_fpregset(regcache*, void*)':
|
||||
../../gdbserver/linux-riscv-low.cc:140:19: error: 'ELF_NFPREG' was not declared in this scope; did you mean 'ELF_NGREG'?
|
||||
140 | for (i = 0; i < ELF_NFPREG - 1; i++, regbuf += flen)
|
||||
| ^~~~~~~~~~
|
||||
| ELF_NGREG
|
||||
|
||||
musl fixed the issue with
|
||||
https://git.musl-libc.org/cgit/musl/commit/?id=e5d2823631bbfebacf48e1a34ed28f28d7cb2570
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/16b19198980ce9c81a618b3f6e8dc9fe28247a28
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
gdb/nat/riscv-linux-tdesc.c | 5 +++++
|
||||
gdbserver/linux-riscv-low.cc | 5 +++++
|
||||
2 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/gdb/nat/riscv-linux-tdesc.c b/gdb/nat/riscv-linux-tdesc.c
|
||||
index 837b1707e0f..667c013006a 100644
|
||||
--- a/gdb/nat/riscv-linux-tdesc.c
|
||||
+++ b/gdb/nat/riscv-linux-tdesc.c
|
||||
@@ -31,6 +31,11 @@
|
||||
# define NFPREG 33
|
||||
#endif
|
||||
|
||||
+/* Work around musl breakage since version 1.1.24. */
|
||||
+#ifndef ELF_NFPREG
|
||||
+# define ELF_NFPREG 33
|
||||
+#endif
|
||||
+
|
||||
/* See nat/riscv-linux-tdesc.h. */
|
||||
|
||||
struct riscv_gdbarch_features
|
||||
diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc
|
||||
index 8bf97ea4aa3..1142dbc7b16 100644
|
||||
--- a/gdbserver/linux-riscv-low.cc
|
||||
+++ b/gdbserver/linux-riscv-low.cc
|
||||
@@ -30,6 +30,11 @@
|
||||
# define NFPREG 33
|
||||
#endif
|
||||
|
||||
+/* Work around musl breakage since version 1.1.24. */
|
||||
+#ifndef ELF_NFPREG
|
||||
+# define ELF_NFPREG 33
|
||||
+#endif
|
||||
+
|
||||
/* Linux target op definitions for the RISC-V architecture. */
|
||||
|
||||
class riscv_target : public linux_process_target
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@@ -0,0 +1,194 @@
|
||||
From db3aaeda1d6b156100d969edb8c0e674bca6b201 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Tromey <tromey@adacore.com>
|
||||
Date: Wed, 12 May 2021 12:39:22 -0600
|
||||
Subject: [PATCH] Fix build on rhES5
|
||||
|
||||
The rhES5 build failed due to an upstream import a while back. The
|
||||
bug here is that, while the 'personality' function exists,
|
||||
ADDR_NO_RANDOMIZE is only defined in <linux/personality.h>, not
|
||||
<sys/personality.h>.
|
||||
|
||||
However, <linux/personality.h> does not declare the 'personality'
|
||||
function, and <sys/personality.h> and <linux/personality.h> cannot
|
||||
both be included.
|
||||
|
||||
This patch restores one of the removed configure checks and updates
|
||||
the code to check it.
|
||||
|
||||
We had this as a local patch at AdaCore, because it seemed like there
|
||||
was no interest upstream. However, now it turns out that this fixes
|
||||
PR build/28555, so I'm sending it now.
|
||||
|
||||
[Upstream: https://sourceware.org/git?p=binutils-gdb.git;h=0b03c6f03d51f441d999e0cee92f81af543d9373]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
gdb/config.in | 4 ++++
|
||||
gdb/configure | 16 ++++++++++++++++
|
||||
gdb/nat/linux-personality.c | 4 ++++
|
||||
gdbserver/config.in | 4 ++++
|
||||
gdbserver/configure | 16 ++++++++++++++++
|
||||
gdbsupport/common.m4 | 5 +++++
|
||||
gdbsupport/config.in | 4 ++++
|
||||
gdbsupport/configure | 16 ++++++++++++++++
|
||||
8 files changed, 69 insertions(+)
|
||||
|
||||
diff --git a/gdb/config.in b/gdb/config.in
|
||||
index 2c30504..776bee9 100644
|
||||
--- a/gdb/config.in
|
||||
+++ b/gdb/config.in
|
||||
@@ -96,6 +96,10 @@
|
||||
/* define if the compiler supports basic C++11 syntax */
|
||||
#undef HAVE_CXX11
|
||||
|
||||
+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if
|
||||
+ you don't. */
|
||||
+#undef HAVE_DECL_ADDR_NO_RANDOMIZE
|
||||
+
|
||||
/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_ASPRINTF
|
||||
diff --git a/gdb/configure b/gdb/configure
|
||||
index 5d89635..27e3194 100755
|
||||
--- a/gdb/configure
|
||||
+++ b/gdb/configure
|
||||
@@ -13838,6 +13838,22 @@ fi
|
||||
done
|
||||
|
||||
|
||||
+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39.
|
||||
+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h,
|
||||
+ # only in linux/personality.h.
|
||||
+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include <sys/personality.h>
|
||||
+"
|
||||
+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then :
|
||||
+ ac_have_decl=1
|
||||
+else
|
||||
+ ac_have_decl=0
|
||||
+fi
|
||||
+
|
||||
+cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl
|
||||
+_ACEOF
|
||||
+
|
||||
+
|
||||
ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default"
|
||||
if test "x$ac_cv_have_decl_strstr" = xyes; then :
|
||||
ac_have_decl=1
|
||||
diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c
|
||||
index 9ce345b..27999fd 100644
|
||||
--- a/gdb/nat/linux-personality.c
|
||||
+++ b/gdb/nat/linux-personality.c
|
||||
@@ -22,6 +22,10 @@
|
||||
|
||||
#include <sys/personality.h>
|
||||
|
||||
+# if !HAVE_DECL_ADDR_NO_RANDOMIZE
|
||||
+# define ADDR_NO_RANDOMIZE 0x0040000
|
||||
+# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */
|
||||
+
|
||||
/* See comment on nat/linux-personality.h. */
|
||||
|
||||
maybe_disable_address_space_randomization::
|
||||
diff --git a/gdbserver/config.in b/gdbserver/config.in
|
||||
index cf06c56..c9258b3 100644
|
||||
--- a/gdbserver/config.in
|
||||
+++ b/gdbserver/config.in
|
||||
@@ -31,6 +31,10 @@
|
||||
/* define if the compiler supports basic C++11 syntax */
|
||||
#undef HAVE_CXX11
|
||||
|
||||
+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if
|
||||
+ you don't. */
|
||||
+#undef HAVE_DECL_ADDR_NO_RANDOMIZE
|
||||
+
|
||||
/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_ASPRINTF
|
||||
diff --git a/gdbserver/configure b/gdbserver/configure
|
||||
index b227167..d399d71 100755
|
||||
--- a/gdbserver/configure
|
||||
+++ b/gdbserver/configure
|
||||
@@ -7131,6 +7131,22 @@ fi
|
||||
done
|
||||
|
||||
|
||||
+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39.
|
||||
+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h,
|
||||
+ # only in linux/personality.h.
|
||||
+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include <sys/personality.h>
|
||||
+"
|
||||
+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then :
|
||||
+ ac_have_decl=1
|
||||
+else
|
||||
+ ac_have_decl=0
|
||||
+fi
|
||||
+
|
||||
+cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl
|
||||
+_ACEOF
|
||||
+
|
||||
+
|
||||
ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default"
|
||||
if test "x$ac_cv_have_decl_strstr" = xyes; then :
|
||||
ac_have_decl=1
|
||||
diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4
|
||||
index 901c454..56a355e 100644
|
||||
--- a/gdbsupport/common.m4
|
||||
+++ b/gdbsupport/common.m4
|
||||
@@ -55,6 +55,11 @@ AC_DEFUN([GDB_AC_COMMON], [
|
||||
ptrace64 sbrk setns sigaltstack sigprocmask \
|
||||
setpgid setpgrp getrusage getauxval sigtimedwait])
|
||||
|
||||
+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39.
|
||||
+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h,
|
||||
+ # only in linux/personality.h.
|
||||
+ AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include <sys/personality.h>])
|
||||
+
|
||||
AC_CHECK_DECLS([strstr])
|
||||
|
||||
# ----------------------- #
|
||||
diff --git a/gdbsupport/config.in b/gdbsupport/config.in
|
||||
index f46e261..6945a62 100644
|
||||
--- a/gdbsupport/config.in
|
||||
+++ b/gdbsupport/config.in
|
||||
@@ -28,6 +28,10 @@
|
||||
/* define if the compiler supports basic C++11 syntax */
|
||||
#undef HAVE_CXX11
|
||||
|
||||
+/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if
|
||||
+ you don't. */
|
||||
+#undef HAVE_DECL_ADDR_NO_RANDOMIZE
|
||||
+
|
||||
/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_ASPRINTF
|
||||
diff --git a/gdbsupport/configure b/gdbsupport/configure
|
||||
index a9dd02c..243a03f 100755
|
||||
--- a/gdbsupport/configure
|
||||
+++ b/gdbsupport/configure
|
||||
@@ -8144,6 +8144,22 @@ fi
|
||||
done
|
||||
|
||||
|
||||
+ # This is needed for RHEL 5 and uclibc-ng < 1.0.39.
|
||||
+ # These did not define ADDR_NO_RANDOMIZE in sys/personality.h,
|
||||
+ # only in linux/personality.h.
|
||||
+ ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include <sys/personality.h>
|
||||
+"
|
||||
+if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then :
|
||||
+ ac_have_decl=1
|
||||
+else
|
||||
+ ac_have_decl=0
|
||||
+fi
|
||||
+
|
||||
+cat >>confdefs.h <<_ACEOF
|
||||
+#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl
|
||||
+_ACEOF
|
||||
+
|
||||
+
|
||||
ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default"
|
||||
if test "x$ac_cv_have_decl_strstr" = xyes; then :
|
||||
ac_have_decl=1
|
||||
--
|
||||
2.33.1
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From c098500aee945ee7a3021649eb0a2655b004103c Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 18 Nov 2021 22:52:08 +0100
|
||||
Subject: [PATCH] gdbserver/Makefile.in: fix NLS build
|
||||
|
||||
Fix the following build failure raised since gdb version 10.1 and
|
||||
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=9a665d62266e75f0519f3a663784c458885b5c63:
|
||||
|
||||
CXXLD libinproctrace.so
|
||||
/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: gdbsupport/tdesc-ipa.o: in function `print_xml_feature::visit(tdesc_type_builtin const*)':
|
||||
/home/buildroot/autobuild/instance-2/output-1/build/gdb-10.2/build/gdbserver/../../gdbserver/../gdbsupport/tdesc.cc:310: undefined reference to `libintl_gettext'
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/faacc874fe9d32b74cb3d3dea988ef661cb0e3d0
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://sourceware.org/pipermail/gdb-patches/2021-November/183580.html]
|
||||
---
|
||||
gdbserver/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
|
||||
index 71c3c4ad959..e69fbc4dae4 100644
|
||||
--- a/gdbserver/Makefile.in
|
||||
+++ b/gdbserver/Makefile.in
|
||||
@@ -383,7 +383,7 @@ $(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS}
|
||||
$(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \
|
||||
-Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
|
||||
$(CXXFLAGS) \
|
||||
- -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread
|
||||
+ -o $(IPA_LIB) ${IPA_OBJS} $(LIBIBERTY_FOR_SHLIB) -ldl -pthread $(INTL)
|
||||
|
||||
# Put the proper machine-specific files first, so M-. on a machine
|
||||
# specific routine gets the one for the correct machine.
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Reference in New Issue
Block a user