And renumber remaining patches.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
--- /dev/null
+From 140bf80050b34f0947b34dba93b830ea2bfc5040 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Thu, 25 Aug 2016 08:42:03 +0100
+Subject: [PATCH] Sync proc_service definition with GLIBC
+
+GLIBC BZ#20311 [1] proc_service.h install patch also remove 'const'
+attributes from ps_get_thread_area and comment #15 discuss why to remove
+the const attribute (basically since it a callback with the struct
+ps_prochandle owned by the client it should be able to modify it if
+it the case).
+
+On default build this is not the issue and current g++ does not trigger
+any issue with this mismatch declaration. However, on some bootstrap
+build configuration where gdbserver is build with gcc instead this
+triggers:
+
+error: conflicting types for 'ps_get_thread_area'
+
+This patch fixes it by syncing the declaration with GLIBC.
+
+[1] https://sourceware.org/bugzilla/show_bug.cgi?id=20311
+
+gdb/ChangeLog:
+
+2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+ * aarch64-linux-nat.c (ps_get_thread_area): Remove const from
+ struct ps_prochandle.
+ * amd64-linux-nat.c (ps_get_thread_area): Likewise.
+ * arm-linux-nat.c (ps_get_thread_area): Likewise.
+ * gdb_proc_service.h (ps_get_thread_area): Likewise.
+ * i386-linux-nat.c (ps_get_thread_area): Likewise.
+ * m68klinux-nat.c (ps_get_thread_area): Likewise.
+ * mips-linux-nat.c (ps_get_thread_area): Likewise.
+ * nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise.
+ * nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise.
+ * xtensa-linux-nat.c (ps_get_thread_area): Likewise.
+
+gdb/gdbserver/ChangeLog:
+
+2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+ PR server/20491
+ * gdb_proc_service.h (ps_get_thread_area): Remove const from struct
+ ps_prochandle.
+ * linux-aarch64-low.c (ps_get_thread_area): Likewise.
+ * linux-arm-low.c (ps_get_thread_area): Likewise.
+ * linux-crisv32-low.c (ps_get_thread_area): Likewise.
+ * linux-m68k-low.c (ps_get_thread_area): Likewise.
+ * linux-mips-low.c (ps_get_thread_area): Likewise.
+ * linux-nios2-low.c (ps_get_thread_area): Likewise.
+ * linux-tic6x-low.c (ps_get_thread_area): Likewise.
+ * linux-x86-low.c (ps_get_thread_area): Likewise.
+ * linux-xtensa-low.c (ps_get_thread_area): Likewise.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ gdb/ChangeLog | 14 ++++++++++++++
+ gdb/aarch64-linux-nat.c | 2 +-
+ gdb/amd64-linux-nat.c | 2 +-
+ gdb/arm-linux-nat.c | 2 +-
+ gdb/gdb_proc_service.h | 2 +-
+ gdb/gdbserver/ChangeLog | 15 +++++++++++++++
+ gdb/gdbserver/gdb_proc_service.h | 2 +-
+ gdb/gdbserver/linux-aarch64-low.c | 2 +-
+ gdb/gdbserver/linux-arm-low.c | 2 +-
+ gdb/gdbserver/linux-crisv32-low.c | 2 +-
+ gdb/gdbserver/linux-m68k-low.c | 2 +-
+ gdb/gdbserver/linux-mips-low.c | 2 +-
+ gdb/gdbserver/linux-nios2-low.c | 2 +-
+ gdb/gdbserver/linux-tic6x-low.c | 2 +-
+ gdb/gdbserver/linux-x86-low.c | 2 +-
+ gdb/gdbserver/linux-xtensa-low.c | 2 +-
+ gdb/i386-linux-nat.c | 2 +-
+ gdb/m68klinux-nat.c | 2 +-
+ gdb/mips-linux-nat.c | 2 +-
+ gdb/nat/aarch64-linux.c | 2 +-
+ gdb/nat/aarch64-linux.h | 2 +-
+ gdb/xtensa-linux-nat.c | 2 +-
+ 22 files changed, 49 insertions(+), 20 deletions(-)
+
+diff --git a/gdb/ChangeLog b/gdb/ChangeLog
+index 9b6562502e..a03afdb82f 100644
+--- a/gdb/ChangeLog
++++ b/gdb/ChangeLog
+@@ -1,3 +1,17 @@
++2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
++
++ * aarch64-linux-nat.c (ps_get_thread_area): Remove const from
++ struct ps_prochandle.
++ * amd64-linux-nat.c (ps_get_thread_area): Likewise.
++ * arm-linux-nat.c (ps_get_thread_area): Likewise.
++ * gdb_proc_service.h (ps_get_thread_area): Likewise.
++ * i386-linux-nat.c (ps_get_thread_area): Likewise.
++ * m68klinux-nat.c (ps_get_thread_area): Likewise.
++ * mips-linux-nat.c (ps_get_thread_area): Likewise.
++ * nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise.
++ * nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise.
++ * xtensa-linux-nat.c (ps_get_thread_area): Likewise.
++
+ 2016-06-01 Joel Brobecker <brobecker@adacore.com>
+
+ * version.in: Set GDB version number to 7.11.1.DATE-git.
+diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
+index fe1631dbbb..5166eebd33 100644
+--- a/gdb/aarch64-linux-nat.c
++++ b/gdb/aarch64-linux-nat.c
+@@ -457,7 +457,7 @@ aarch64_linux_new_fork (struct lwp_info *parent, pid_t child_pid)
+ storage (or its descriptor). */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ int is_64bit_p
+diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
+index 391a646992..9da36fd1ba 100644
+--- a/gdb/amd64-linux-nat.c
++++ b/gdb/amd64-linux-nat.c
+@@ -245,7 +245,7 @@ amd64_linux_store_inferior_registers (struct target_ops *ops,
+ a request for a thread's local storage address. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32)
+diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
+index d77ca93498..d11bdc6e22 100644
+--- a/gdb/arm-linux-nat.c
++++ b/gdb/arm-linux-nat.c
+@@ -477,7 +477,7 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
+ /* Fetch the thread-local storage pointer for libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h
+index 04d3c03884..a1a8eb5b2f 100644
+--- a/gdb/gdb_proc_service.h
++++ b/gdb/gdb_proc_service.h
+@@ -124,7 +124,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
+ /* Fetch the special per-thread address associated with the given LWP.
+ This call is only used on a few platforms (most use a normal register).
+ The meaning of the `int' parameter is machine-dependent. */
+-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
+ lwpid_t, int, psaddr_t *);
+
+
+diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
+index 08fef5b06e..ea278b1250 100644
+--- a/gdb/gdbserver/ChangeLog
++++ b/gdb/gdbserver/ChangeLog
+@@ -1,3 +1,18 @@
++2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
++
++ PR server/20491
++ * gdb_proc_service.h (ps_get_thread_area): Remove const from struct
++ ps_prochandle.
++ * linux-aarch64-low.c (ps_get_thread_area): Likewise.
++ * linux-arm-low.c (ps_get_thread_area): Likewise.
++ * linux-crisv32-low.c (ps_get_thread_area): Likewise.
++ * linux-m68k-low.c (ps_get_thread_area): Likewise.
++ * linux-mips-low.c (ps_get_thread_area): Likewise.
++ * linux-nios2-low.c (ps_get_thread_area): Likewise.
++ * linux-tic6x-low.c (ps_get_thread_area): Likewise.
++ * linux-x86-low.c (ps_get_thread_area): Likewise.
++ * linux-xtensa-low.c (ps_get_thread_area): Likewise.
++
+ 2016-04-15 Pedro Alves <palves@redhat.com>
+
+ * linux-low.c (check_stopped_by_breakpoint): Rename to ...
+diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h
+index 99bf226b01..cec9231ee5 100644
+--- a/gdb/gdbserver/gdb_proc_service.h
++++ b/gdb/gdbserver/gdb_proc_service.h
+@@ -107,7 +107,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
+ /* Fetch the special per-thread address associated with the given LWP.
+ This call is only used on a few platforms (most use a normal register).
+ The meaning of the `int' parameter is machine-dependent. */
+-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
+ lwpid_t, int, psaddr_t *);
+
+
+diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
+index 806a76260f..b86f210390 100644
+--- a/gdb/gdbserver/linux-aarch64-low.c
++++ b/gdb/gdbserver/linux-aarch64-low.c
+@@ -421,7 +421,7 @@ aarch64_stopped_by_watchpoint (void)
+ /* Fetch the thread-local storage pointer for libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ return aarch64_ps_get_thread_area (ph, lwpid, idx, base,
+diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
+index 0f627069e0..9f043878c7 100644
+--- a/gdb/gdbserver/linux-arm-low.c
++++ b/gdb/gdbserver/linux-arm-low.c
+@@ -269,7 +269,7 @@ get_next_pcs_read_memory_unsigned_integer (CORE_ADDR memaddr,
+ /* Fetch the thread-local storage pointer for libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c
+index 16c1f72015..fea6d5bf9b 100644
+--- a/gdb/gdbserver/linux-crisv32-low.c
++++ b/gdb/gdbserver/linux-crisv32-low.c
+@@ -309,7 +309,7 @@ cris_stopped_data_address (void)
+ }
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c
+index df3d7c6d9c..78a340fa8f 100644
+--- a/gdb/gdbserver/linux-m68k-low.c
++++ b/gdb/gdbserver/linux-m68k-low.c
+@@ -152,7 +152,7 @@ m68k_breakpoint_at (CORE_ADDR pc)
+ /* Fetch the thread-local storage pointer for libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c
+index 30a03d5f43..9356bb3d99 100644
+--- a/gdb/gdbserver/linux-mips-low.c
++++ b/gdb/gdbserver/linux-mips-low.c
+@@ -637,7 +637,7 @@ mips_stopped_data_address (void)
+ /* Fetch the thread-local storage pointer for libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-nios2-low.c b/gdb/gdbserver/linux-nios2-low.c
+index ea0ded1f1e..98a85ed8e3 100644
+--- a/gdb/gdbserver/linux-nios2-low.c
++++ b/gdb/gdbserver/linux-nios2-low.c
+@@ -145,7 +145,7 @@ nios2_breakpoint_at (CORE_ADDR where)
+ /* Fetch the thread-local storage pointer for libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c
+index e40a3aff51..6b90560dc4 100644
+--- a/gdb/gdbserver/linux-tic6x-low.c
++++ b/gdb/gdbserver/linux-tic6x-low.c
+@@ -274,7 +274,7 @@ tic6x_breakpoint_at (CORE_ADDR where)
+ /* Fetch the thread-local storage pointer for libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
+index 0c4954a58d..8bac10a54b 100644
+--- a/gdb/gdbserver/linux-x86-low.c
++++ b/gdb/gdbserver/linux-x86-low.c
+@@ -236,7 +236,7 @@ is_64bit_tdesc (void)
+ /* Called by libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ #ifdef __x86_64__
+diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c
+index 6e945eac17..431082c01f 100644
+--- a/gdb/gdbserver/linux-xtensa-low.c
++++ b/gdb/gdbserver/linux-xtensa-low.c
+@@ -177,7 +177,7 @@ xtensa_breakpoint_at (CORE_ADDR where)
+ /* Called by libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ xtensa_elf_gregset_t regs;
+diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
+index a41ee21081..70d954fdc0 100644
+--- a/gdb/i386-linux-nat.c
++++ b/gdb/i386-linux-nat.c
+@@ -603,7 +603,7 @@ i386_linux_store_inferior_registers (struct target_ops *ops,
+ storage (or its descriptor). */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ unsigned int base_addr;
+diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
+index 24b6242ba3..5b8684b719 100644
+--- a/gdb/m68klinux-nat.c
++++ b/gdb/m68klinux-nat.c
+@@ -508,7 +508,7 @@ m68k_linux_store_inferior_registers (struct target_ops *ops,
+ /* Fetch the thread-local storage pointer for libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) < 0)
+diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
+index bfe9fcbe68..0f20f16814 100644
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -152,7 +152,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store)
+ /* Fetch the thread-local storage pointer for libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/nat/aarch64-linux.c b/gdb/nat/aarch64-linux.c
+index 5ae5aa8602..1828977e28 100644
+--- a/gdb/nat/aarch64-linux.c
++++ b/gdb/nat/aarch64-linux.c
+@@ -205,7 +205,7 @@ aarch64_siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
+ storage (or its descriptor). */
+
+ ps_err_e
+-aarch64_ps_get_thread_area (const struct ps_prochandle *ph,
++aarch64_ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base,
+ int is_64bit_p)
+ {
+diff --git a/gdb/nat/aarch64-linux.h b/gdb/nat/aarch64-linux.h
+index 7221982b78..aac7c68c06 100644
+--- a/gdb/nat/aarch64-linux.h
++++ b/gdb/nat/aarch64-linux.h
+@@ -122,7 +122,7 @@ void aarch64_linux_prepare_to_resume (struct lwp_info *lwp);
+
+ void aarch64_linux_new_thread (struct lwp_info *lwp);
+
+-ps_err_e aarch64_ps_get_thread_area (const struct ps_prochandle *ph,
++ps_err_e aarch64_ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base,
+ int is_64bit_p);
+
+diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
+index 54da83791a..836d3f80ee 100644
+--- a/gdb/xtensa-linux-nat.c
++++ b/gdb/xtensa-linux-nat.c
+@@ -286,7 +286,7 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops,
+ /* Called by libthread_db. */
+
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+ {
+ xtensa_elf_gregset_t regs;
+--
+2.11.0
+
+++ /dev/null
-From 7a09ed68e203a813d88fb7fc6eeb1e92209561a5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 8 Aug 2016 13:06:49 +0800
-Subject: [PATCH] sim: bfin: split out common mach/model defines into arch.h
- [PR sim/20438]
-
-The current machs.h mixes common enums with Blackfin-specific defines.
-This causes us troubles with header inclusion order such that we can't
-drop the old SIM_CPU typedef (which is duplicated in common code). By
-splitting the two up, we can unwind this dependency chain, and drop the
-old typedef. It also fixes building with older gcc versions.
-
-[Romain: backport from gdb 7.12]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-
----
- sim/bfin/ChangeLog | 9 +++++++++
- sim/bfin/arch.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
- sim/bfin/machs.h | 20 --------------------
- sim/bfin/sim-main.h | 8 ++------
- 4 files changed, 55 insertions(+), 26 deletions(-)
- create mode 100644 sim/bfin/arch.h
-
-diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
-index 3dea7c9..a995436 100644
---- a/sim/bfin/ChangeLog
-+++ b/sim/bfin/ChangeLog
-@@ -1,3 +1,12 @@
-+2016-08-13 Mike Frysinger <vapier@gentoo.org>
-+
-+ PR sim/20438
-+ * machs.h (MODEL_TYPE, MACH_ATTR, BFIN_INSN_*): Move ...
-+ * arch.h: ... to this new header file.
-+ * sim-main.h (SIM_CPU): Delete.
-+ Include arch.h before sim-base.h, and move sim-base.h before
-+ bfin-sim.h.
-+
- 2016-01-10 Mike Frysinger <vapier@gentoo.org>
-
- * config.in, configure: Regenerate.
-diff --git a/sim/bfin/arch.h b/sim/bfin/arch.h
-new file mode 100644
-index 0000000..b86d3e9
---- /dev/null
-+++ b/sim/bfin/arch.h
-@@ -0,0 +1,44 @@
-+/* Simulator for Analog Devices Blackfin processors.
-+
-+ Copyright (C) 2005-2016 Free Software Foundation, Inc.
-+ Contributed by Analog Devices, Inc.
-+
-+ This file is part of simulators.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 3 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-+
-+#ifndef BFIN_ARCH_H
-+#define BFIN_ARCH_H
-+
-+typedef enum model_type {
-+#define P(n) MODEL_BF##n,
-+#include "proc_list.def"
-+#undef P
-+ MODEL_MAX
-+} MODEL_TYPE;
-+
-+typedef enum mach_attr {
-+ MACH_BASE,
-+ MACH_BFIN,
-+ MACH_MAX
-+} MACH_ATTR;
-+
-+enum {
-+#define I(insn) BFIN_INSN_##insn,
-+#include "insn_list.def"
-+#undef I
-+ BFIN_INSN_MAX
-+};
-+
-+#endif
-diff --git a/sim/bfin/machs.h b/sim/bfin/machs.h
-index 0372982..36819ae 100644
---- a/sim/bfin/machs.h
-+++ b/sim/bfin/machs.h
-@@ -21,19 +21,6 @@
- #ifndef _BFIN_MACHS_H_
- #define _BFIN_MACHS_H_
-
--typedef enum model_type {
--#define P(n) MODEL_BF##n,
--#include "proc_list.def"
--#undef P
-- MODEL_MAX
--} MODEL_TYPE;
--
--typedef enum mach_attr {
-- MACH_BASE,
-- MACH_BFIN,
-- MACH_MAX
--} MACH_ATTR;
--
- #define CPU_MODEL_NUM(cpu) MODEL_NUM (CPU_MODEL (cpu))
-
- /* XXX: Some of this probably belongs in CPU_MODEL. */
-@@ -46,13 +33,6 @@ void bfin_model_cpu_init (SIM_DESC, SIM_CPU *);
- bu32 bfin_model_get_chipid (SIM_DESC);
- bu32 bfin_model_get_dspid (SIM_DESC);
-
--enum {
--#define I(insn) BFIN_INSN_##insn,
--#include "insn_list.def"
--#undef I
-- BFIN_INSN_MAX
--};
--
- #define BFIN_COREMMR_CEC_BASE 0xFFE02100
- #define BFIN_COREMMR_CEC_SIZE (4 * 5)
- #define BFIN_COREMMR_CTIMER_BASE 0xFFE03000
-diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
-index 51fb87e..34fd153 100644
---- a/sim/bfin/sim-main.h
-+++ b/sim/bfin/sim-main.h
-@@ -23,17 +23,13 @@
-
- #include "sim-basics.h"
- #include "sim-signal.h"
--
--/* TODO: Delete this. Need to convert bu32/etc... to common sim types
-- and unwind the bfin-sim.h/machs.h include below first though. */
--typedef struct _sim_cpu SIM_CPU;
-+#include "arch.h"
-+#include "sim-base.h"
-
- #include "bfin-sim.h"
-
- #include "machs.h"
-
--#include "sim-base.h"
--
- struct _sim_cpu {
- /* ... simulator specific members ... */
- struct bfin_cpu_state state;
---
-2.9.3
-
+++ /dev/null
-From 140bf80050b34f0947b34dba93b830ea2bfc5040 Mon Sep 17 00:00:00 2001
-From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-Date: Thu, 25 Aug 2016 08:42:03 +0100
-Subject: [PATCH] Sync proc_service definition with GLIBC
-
-GLIBC BZ#20311 [1] proc_service.h install patch also remove 'const'
-attributes from ps_get_thread_area and comment #15 discuss why to remove
-the const attribute (basically since it a callback with the struct
-ps_prochandle owned by the client it should be able to modify it if
-it the case).
-
-On default build this is not the issue and current g++ does not trigger
-any issue with this mismatch declaration. However, on some bootstrap
-build configuration where gdbserver is build with gcc instead this
-triggers:
-
-error: conflicting types for 'ps_get_thread_area'
-
-This patch fixes it by syncing the declaration with GLIBC.
-
-[1] https://sourceware.org/bugzilla/show_bug.cgi?id=20311
-
-gdb/ChangeLog:
-
-2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
-
- * aarch64-linux-nat.c (ps_get_thread_area): Remove const from
- struct ps_prochandle.
- * amd64-linux-nat.c (ps_get_thread_area): Likewise.
- * arm-linux-nat.c (ps_get_thread_area): Likewise.
- * gdb_proc_service.h (ps_get_thread_area): Likewise.
- * i386-linux-nat.c (ps_get_thread_area): Likewise.
- * m68klinux-nat.c (ps_get_thread_area): Likewise.
- * mips-linux-nat.c (ps_get_thread_area): Likewise.
- * nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise.
- * nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise.
- * xtensa-linux-nat.c (ps_get_thread_area): Likewise.
-
-gdb/gdbserver/ChangeLog:
-
-2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
-
- PR server/20491
- * gdb_proc_service.h (ps_get_thread_area): Remove const from struct
- ps_prochandle.
- * linux-aarch64-low.c (ps_get_thread_area): Likewise.
- * linux-arm-low.c (ps_get_thread_area): Likewise.
- * linux-crisv32-low.c (ps_get_thread_area): Likewise.
- * linux-m68k-low.c (ps_get_thread_area): Likewise.
- * linux-mips-low.c (ps_get_thread_area): Likewise.
- * linux-nios2-low.c (ps_get_thread_area): Likewise.
- * linux-tic6x-low.c (ps_get_thread_area): Likewise.
- * linux-x86-low.c (ps_get_thread_area): Likewise.
- * linux-xtensa-low.c (ps_get_thread_area): Likewise.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- gdb/ChangeLog | 14 ++++++++++++++
- gdb/aarch64-linux-nat.c | 2 +-
- gdb/amd64-linux-nat.c | 2 +-
- gdb/arm-linux-nat.c | 2 +-
- gdb/gdb_proc_service.h | 2 +-
- gdb/gdbserver/ChangeLog | 15 +++++++++++++++
- gdb/gdbserver/gdb_proc_service.h | 2 +-
- gdb/gdbserver/linux-aarch64-low.c | 2 +-
- gdb/gdbserver/linux-arm-low.c | 2 +-
- gdb/gdbserver/linux-crisv32-low.c | 2 +-
- gdb/gdbserver/linux-m68k-low.c | 2 +-
- gdb/gdbserver/linux-mips-low.c | 2 +-
- gdb/gdbserver/linux-nios2-low.c | 2 +-
- gdb/gdbserver/linux-tic6x-low.c | 2 +-
- gdb/gdbserver/linux-x86-low.c | 2 +-
- gdb/gdbserver/linux-xtensa-low.c | 2 +-
- gdb/i386-linux-nat.c | 2 +-
- gdb/m68klinux-nat.c | 2 +-
- gdb/mips-linux-nat.c | 2 +-
- gdb/nat/aarch64-linux.c | 2 +-
- gdb/nat/aarch64-linux.h | 2 +-
- gdb/xtensa-linux-nat.c | 2 +-
- 22 files changed, 49 insertions(+), 20 deletions(-)
-
-diff --git a/gdb/ChangeLog b/gdb/ChangeLog
-index 9b6562502e..a03afdb82f 100644
---- a/gdb/ChangeLog
-+++ b/gdb/ChangeLog
-@@ -1,3 +1,17 @@
-+2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
-+
-+ * aarch64-linux-nat.c (ps_get_thread_area): Remove const from
-+ struct ps_prochandle.
-+ * amd64-linux-nat.c (ps_get_thread_area): Likewise.
-+ * arm-linux-nat.c (ps_get_thread_area): Likewise.
-+ * gdb_proc_service.h (ps_get_thread_area): Likewise.
-+ * i386-linux-nat.c (ps_get_thread_area): Likewise.
-+ * m68klinux-nat.c (ps_get_thread_area): Likewise.
-+ * mips-linux-nat.c (ps_get_thread_area): Likewise.
-+ * nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise.
-+ * nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise.
-+ * xtensa-linux-nat.c (ps_get_thread_area): Likewise.
-+
- 2016-06-01 Joel Brobecker <brobecker@adacore.com>
-
- * version.in: Set GDB version number to 7.11.1.DATE-git.
-diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
-index fe1631dbbb..5166eebd33 100644
---- a/gdb/aarch64-linux-nat.c
-+++ b/gdb/aarch64-linux-nat.c
-@@ -457,7 +457,7 @@ aarch64_linux_new_fork (struct lwp_info *parent, pid_t child_pid)
- storage (or its descriptor). */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- int is_64bit_p
-diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
-index 391a646992..9da36fd1ba 100644
---- a/gdb/amd64-linux-nat.c
-+++ b/gdb/amd64-linux-nat.c
-@@ -245,7 +245,7 @@ amd64_linux_store_inferior_registers (struct target_ops *ops,
- a request for a thread's local storage address. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32)
-diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
-index d77ca93498..d11bdc6e22 100644
---- a/gdb/arm-linux-nat.c
-+++ b/gdb/arm-linux-nat.c
-@@ -477,7 +477,7 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
- /* Fetch the thread-local storage pointer for libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
-diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h
-index 04d3c03884..a1a8eb5b2f 100644
---- a/gdb/gdb_proc_service.h
-+++ b/gdb/gdb_proc_service.h
-@@ -124,7 +124,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
- /* Fetch the special per-thread address associated with the given LWP.
- This call is only used on a few platforms (most use a normal register).
- The meaning of the `int' parameter is machine-dependent. */
--extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
-+extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
- lwpid_t, int, psaddr_t *);
-
-
-diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
-index 08fef5b06e..ea278b1250 100644
---- a/gdb/gdbserver/ChangeLog
-+++ b/gdb/gdbserver/ChangeLog
-@@ -1,3 +1,18 @@
-+2016-08-25 Adhemerval Zanella <adhemerval.zanella@linaro.org>
-+
-+ PR server/20491
-+ * gdb_proc_service.h (ps_get_thread_area): Remove const from struct
-+ ps_prochandle.
-+ * linux-aarch64-low.c (ps_get_thread_area): Likewise.
-+ * linux-arm-low.c (ps_get_thread_area): Likewise.
-+ * linux-crisv32-low.c (ps_get_thread_area): Likewise.
-+ * linux-m68k-low.c (ps_get_thread_area): Likewise.
-+ * linux-mips-low.c (ps_get_thread_area): Likewise.
-+ * linux-nios2-low.c (ps_get_thread_area): Likewise.
-+ * linux-tic6x-low.c (ps_get_thread_area): Likewise.
-+ * linux-x86-low.c (ps_get_thread_area): Likewise.
-+ * linux-xtensa-low.c (ps_get_thread_area): Likewise.
-+
- 2016-04-15 Pedro Alves <palves@redhat.com>
-
- * linux-low.c (check_stopped_by_breakpoint): Rename to ...
-diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h
-index 99bf226b01..cec9231ee5 100644
---- a/gdb/gdbserver/gdb_proc_service.h
-+++ b/gdb/gdbserver/gdb_proc_service.h
-@@ -107,7 +107,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
- /* Fetch the special per-thread address associated with the given LWP.
- This call is only used on a few platforms (most use a normal register).
- The meaning of the `int' parameter is machine-dependent. */
--extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
-+extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
- lwpid_t, int, psaddr_t *);
-
-
-diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
-index 806a76260f..b86f210390 100644
---- a/gdb/gdbserver/linux-aarch64-low.c
-+++ b/gdb/gdbserver/linux-aarch64-low.c
-@@ -421,7 +421,7 @@ aarch64_stopped_by_watchpoint (void)
- /* Fetch the thread-local storage pointer for libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- return aarch64_ps_get_thread_area (ph, lwpid, idx, base,
-diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
-index 0f627069e0..9f043878c7 100644
---- a/gdb/gdbserver/linux-arm-low.c
-+++ b/gdb/gdbserver/linux-arm-low.c
-@@ -269,7 +269,7 @@ get_next_pcs_read_memory_unsigned_integer (CORE_ADDR memaddr,
- /* Fetch the thread-local storage pointer for libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
-diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c
-index 16c1f72015..fea6d5bf9b 100644
---- a/gdb/gdbserver/linux-crisv32-low.c
-+++ b/gdb/gdbserver/linux-crisv32-low.c
-@@ -309,7 +309,7 @@ cris_stopped_data_address (void)
- }
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
-diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c
-index df3d7c6d9c..78a340fa8f 100644
---- a/gdb/gdbserver/linux-m68k-low.c
-+++ b/gdb/gdbserver/linux-m68k-low.c
-@@ -152,7 +152,7 @@ m68k_breakpoint_at (CORE_ADDR pc)
- /* Fetch the thread-local storage pointer for libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
-diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c
-index 30a03d5f43..9356bb3d99 100644
---- a/gdb/gdbserver/linux-mips-low.c
-+++ b/gdb/gdbserver/linux-mips-low.c
-@@ -637,7 +637,7 @@ mips_stopped_data_address (void)
- /* Fetch the thread-local storage pointer for libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
-diff --git a/gdb/gdbserver/linux-nios2-low.c b/gdb/gdbserver/linux-nios2-low.c
-index ea0ded1f1e..98a85ed8e3 100644
---- a/gdb/gdbserver/linux-nios2-low.c
-+++ b/gdb/gdbserver/linux-nios2-low.c
-@@ -145,7 +145,7 @@ nios2_breakpoint_at (CORE_ADDR where)
- /* Fetch the thread-local storage pointer for libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
-diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c
-index e40a3aff51..6b90560dc4 100644
---- a/gdb/gdbserver/linux-tic6x-low.c
-+++ b/gdb/gdbserver/linux-tic6x-low.c
-@@ -274,7 +274,7 @@ tic6x_breakpoint_at (CORE_ADDR where)
- /* Fetch the thread-local storage pointer for libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
-diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
-index 0c4954a58d..8bac10a54b 100644
---- a/gdb/gdbserver/linux-x86-low.c
-+++ b/gdb/gdbserver/linux-x86-low.c
-@@ -236,7 +236,7 @@ is_64bit_tdesc (void)
- /* Called by libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- #ifdef __x86_64__
-diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c
-index 6e945eac17..431082c01f 100644
---- a/gdb/gdbserver/linux-xtensa-low.c
-+++ b/gdb/gdbserver/linux-xtensa-low.c
-@@ -177,7 +177,7 @@ xtensa_breakpoint_at (CORE_ADDR where)
- /* Called by libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- xtensa_elf_gregset_t regs;
-diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
-index a41ee21081..70d954fdc0 100644
---- a/gdb/i386-linux-nat.c
-+++ b/gdb/i386-linux-nat.c
-@@ -603,7 +603,7 @@ i386_linux_store_inferior_registers (struct target_ops *ops,
- storage (or its descriptor). */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- unsigned int base_addr;
-diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
-index 24b6242ba3..5b8684b719 100644
---- a/gdb/m68klinux-nat.c
-+++ b/gdb/m68klinux-nat.c
-@@ -508,7 +508,7 @@ m68k_linux_store_inferior_registers (struct target_ops *ops,
- /* Fetch the thread-local storage pointer for libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) < 0)
-diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
-index bfe9fcbe68..0f20f16814 100644
---- a/gdb/mips-linux-nat.c
-+++ b/gdb/mips-linux-nat.c
-@@ -152,7 +152,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store)
- /* Fetch the thread-local storage pointer for libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
-diff --git a/gdb/nat/aarch64-linux.c b/gdb/nat/aarch64-linux.c
-index 5ae5aa8602..1828977e28 100644
---- a/gdb/nat/aarch64-linux.c
-+++ b/gdb/nat/aarch64-linux.c
-@@ -205,7 +205,7 @@ aarch64_siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
- storage (or its descriptor). */
-
- ps_err_e
--aarch64_ps_get_thread_area (const struct ps_prochandle *ph,
-+aarch64_ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base,
- int is_64bit_p)
- {
-diff --git a/gdb/nat/aarch64-linux.h b/gdb/nat/aarch64-linux.h
-index 7221982b78..aac7c68c06 100644
---- a/gdb/nat/aarch64-linux.h
-+++ b/gdb/nat/aarch64-linux.h
-@@ -122,7 +122,7 @@ void aarch64_linux_prepare_to_resume (struct lwp_info *lwp);
-
- void aarch64_linux_new_thread (struct lwp_info *lwp);
-
--ps_err_e aarch64_ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_err_e aarch64_ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base,
- int is_64bit_p);
-
-diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
-index 54da83791a..836d3f80ee 100644
---- a/gdb/xtensa-linux-nat.c
-+++ b/gdb/xtensa-linux-nat.c
-@@ -286,7 +286,7 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops,
- /* Called by libthread_db. */
-
- ps_err_e
--ps_get_thread_area (const struct ps_prochandle *ph,
-+ps_get_thread_area (struct ps_prochandle *ph,
- lwpid_t lwpid, int idx, void **base)
- {
- xtensa_elf_gregset_t regs;
---
-2.11.0
-
--- /dev/null
+From 7438f3e5a41adf54cf82cd82d3d52244e77d7d05 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>
+---
+ gdb/gdbserver/linux-ppc-low.c | 6 ++++++
+ gdb/nat/ppc-linux.h | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
+index 2145c50..777905d 100644
+--- a/gdb/gdbserver/linux-ppc-low.c
++++ b/gdb/gdbserver/linux-ppc-low.c
+@@ -21,7 +21,13 @@
+ #include "linux-low.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 "nat/ppc-linux.h"
+
+diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
+index 85fbcd8..cbec9c5 100644
+--- a/gdb/nat/ppc-linux.h
++++ b/gdb/nat/ppc-linux.h
+@@ -18,7 +18,13 @@
+ #ifndef PPC_LINUX_H
+ #define PPC_LINUX_H 1
+
++#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. */
+--
+2.7.4
+
+++ /dev/null
-From 7438f3e5a41adf54cf82cd82d3d52244e77d7d05 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>
----
- gdb/gdbserver/linux-ppc-low.c | 6 ++++++
- gdb/nat/ppc-linux.h | 6 ++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
-index 2145c50..777905d 100644
---- a/gdb/gdbserver/linux-ppc-low.c
-+++ b/gdb/gdbserver/linux-ppc-low.c
-@@ -21,7 +21,13 @@
- #include "linux-low.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 "nat/ppc-linux.h"
-
-diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
-index 85fbcd8..cbec9c5 100644
---- a/gdb/nat/ppc-linux.h
-+++ b/gdb/nat/ppc-linux.h
-@@ -18,7 +18,13 @@
- #ifndef PPC_LINUX_H
- #define PPC_LINUX_H 1
-
-+#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. */
---
-2.7.4
-
--- /dev/null
+From b7cbde12595599768bf2831e311a8ab265322313 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>
+---
+ gdb/gdbserver/linux-sh-low.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c
+index 38612e2..3195d0d 100644
+--- a/gdb/gdbserver/linux-sh-low.c
++++ b/gdb/gdbserver/linux-sh-low.c
+@@ -27,7 +27,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.7.4
+
--- /dev/null
+From d6bf0c57a6bf361ac53887653aa1878e60d56335 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 9 Jun 2017 10:19:32 +0200
+Subject: [PATCH] Fix gdbserver build on uClibc/noMMU
+
+The noMMU specific code requires including <sched.h>.
+
+Originally from
+https://cgit.openadk.org/cgi/cgit/openadk.git/plain/package/gdbserver/patches/nommu.patch.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/nat/linux-ptrace.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 0a23bcb..35b7cbb 100644
+--- a/gdb/nat/linux-ptrace.h
++++ b/gdb/nat/linux-ptrace.h
+@@ -23,7 +23,8 @@ struct buffer;
+ #include "nat/gdb_ptrace.h"
+
+ #ifdef __UCLIBC__
+-#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
++#include <sched.h>
++#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__))
+ /* PTRACE_TEXT_ADDR and friends. */
+ #include <asm/ptrace.h>
+ #define HAS_NOMMU
+--
+2.7.4
+
+++ /dev/null
-From b7cbde12595599768bf2831e311a8ab265322313 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>
----
- gdb/gdbserver/linux-sh-low.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c
-index 38612e2..3195d0d 100644
---- a/gdb/gdbserver/linux-sh-low.c
-+++ b/gdb/gdbserver/linux-sh-low.c
-@@ -27,7 +27,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.7.4
-
+++ /dev/null
-From d6bf0c57a6bf361ac53887653aa1878e60d56335 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 9 Jun 2017 10:19:32 +0200
-Subject: [PATCH] Fix gdbserver build on uClibc/noMMU
-
-The noMMU specific code requires including <sched.h>.
-
-Originally from
-https://cgit.openadk.org/cgi/cgit/openadk.git/plain/package/gdbserver/patches/nommu.patch.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- gdb/nat/linux-ptrace.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
-index 0a23bcb..35b7cbb 100644
---- a/gdb/nat/linux-ptrace.h
-+++ b/gdb/nat/linux-ptrace.h
-@@ -23,7 +23,8 @@ struct buffer;
- #include "nat/gdb_ptrace.h"
-
- #ifdef __UCLIBC__
--#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
-+#include <sched.h>
-+#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__))
- /* PTRACE_TEXT_ADDR and friends. */
- #include <asm/ptrace.h>
- #define HAS_NOMMU
---
-2.7.4
-
--- /dev/null
+From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 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 f2df1b9907..d24664cb56 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.13.1
+
+++ /dev/null
-From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 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 f2df1b9907..d24664cb56 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.13.1
-
projects / buildroot.git / commitdiff