darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sync proc_service definition with GLIBC

Browse source 
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.
This commit is contained in:
Adhemerval Zanella 2016-08-25 08:42:03 +01:00 committed by Yao Qi
parent 4a64c29a55
commit 754653a7c0
22 changed files with 49 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gdb/ChangeLog
View file

@ -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-08-24 Simon Marchi <simon.marchi@ericsson.com> 2016-08-24 Simon Marchi <simon.marchi@ericsson.com>
* infcmd.c (set_inferior_io_terminal): Set inferior terminal to * infcmd.c (set_inferior_io_terminal): Set inferior terminal to

2
gdb/aarch64-linux-nat.c
View file

@ -457,7 +457,7 @@ aarch64_linux_new_fork (struct lwp_info *parent, pid_t child_pid)
storage (or its descriptor). */ storage (or its descriptor). */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
int is_64bit_p int is_64bit_p

2
gdb/amd64-linux-nat.c
View file

@ -245,7 +245,7 @@ amd64_linux_store_inferior_registers (struct target_ops *ops,
a request for a thread's local storage address. */ a request for a thread's local storage address. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32) if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32)

2
gdb/arm-linux-nat.c
View file

@ -477,7 +477,7 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
/* Fetch the thread-local storage pointer for libthread_db. */ /* Fetch the thread-local storage pointer for libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)

2
gdb/gdb_proc_service.h
View file

@ -124,7 +124,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
/* Fetch the special per-thread address associated with the given LWP. /* 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). This call is only used on a few platforms (most use a normal register).
The meaning of the `int' parameter is machine-dependent. */ 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 *); lwpid_t, int, psaddr_t *);

15
gdb/gdbserver/ChangeLog
View file

@ -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-08-19 Pedro Alves <palves@redhat.com> 2016-08-19 Pedro Alves <palves@redhat.com>
* linux-x86-low.c (amd64_emit_call): Emit missing call opcode. * linux-x86-low.c (amd64_emit_call): Emit missing call opcode.

2
gdb/gdbserver/gdb_proc_service.h
View file

@ -107,7 +107,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
/* Fetch the special per-thread address associated with the given LWP. /* 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). This call is only used on a few platforms (most use a normal register).
The meaning of the `int' parameter is machine-dependent. */ 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 *); lwpid_t, int, psaddr_t *);

2
gdb/gdbserver/linux-aarch64-low.c
View file

@ -401,7 +401,7 @@ aarch64_stopped_by_watchpoint (void)
/* Fetch the thread-local storage pointer for libthread_db. */ /* Fetch the thread-local storage pointer for libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
return aarch64_ps_get_thread_area (ph, lwpid, idx, base, return aarch64_ps_get_thread_area (ph, lwpid, idx, base,

2
gdb/gdbserver/linux-arm-low.c
View file

@ -270,7 +270,7 @@ get_next_pcs_read_memory_unsigned_integer (CORE_ADDR memaddr,
/* Fetch the thread-local storage pointer for libthread_db. */ /* Fetch the thread-local storage pointer for libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)

2
gdb/gdbserver/linux-crisv32-low.c
View file

@ -309,7 +309,7 @@ cris_stopped_data_address (void)
} }
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)

2
gdb/gdbserver/linux-m68k-low.c
View file

@ -152,7 +152,7 @@ m68k_breakpoint_at (CORE_ADDR pc)
/* Fetch the thread-local storage pointer for libthread_db. */ /* Fetch the thread-local storage pointer for libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)

2
gdb/gdbserver/linux-mips-low.c
View file

@ -637,7 +637,7 @@ mips_stopped_data_address (void)
/* Fetch the thread-local storage pointer for libthread_db. */ /* Fetch the thread-local storage pointer for libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)

2
gdb/gdbserver/linux-nios2-low.c
View file

@ -145,7 +145,7 @@ nios2_breakpoint_at (CORE_ADDR where)
/* Fetch the thread-local storage pointer for libthread_db. */ /* Fetch the thread-local storage pointer for libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)

2
gdb/gdbserver/linux-tic6x-low.c
View file

@ -274,7 +274,7 @@ tic6x_breakpoint_at (CORE_ADDR where)
/* Fetch the thread-local storage pointer for libthread_db. */ /* Fetch the thread-local storage pointer for libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)

2
gdb/gdbserver/linux-x86-low.c
View file

@ -186,7 +186,7 @@ is_64bit_tdesc (void)
/* Called by libthread_db. */ /* Called by libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
#ifdef __x86_64__ #ifdef __x86_64__

2
gdb/gdbserver/linux-xtensa-low.c
View file

@ -177,7 +177,7 @@ xtensa_breakpoint_at (CORE_ADDR where)
/* Called by libthread_db. */ /* Called by libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
xtensa_elf_gregset_t regs; xtensa_elf_gregset_t regs;

2
gdb/i386-linux-nat.c
View file

@ -603,7 +603,7 @@ i386_linux_store_inferior_registers (struct target_ops *ops,
storage (or its descriptor). */ storage (or its descriptor). */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
unsigned int base_addr; unsigned int base_addr;

2
gdb/m68klinux-nat.c
View file

@ -508,7 +508,7 @@ m68k_linux_store_inferior_registers (struct target_ops *ops,
/* Fetch the thread-local storage pointer for libthread_db. */ /* Fetch the thread-local storage pointer for libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) < 0) if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) < 0)

2
gdb/mips-linux-nat.c
View file

@ -152,7 +152,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store)
/* Fetch the thread-local storage pointer for libthread_db. */ /* Fetch the thread-local storage pointer for libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)

2
gdb/nat/aarch64-linux.c
View file

@ -205,7 +205,7 @@ aarch64_siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
storage (or its descriptor). */ storage (or its descriptor). */
ps_err_e 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, lwpid_t lwpid, int idx, void **base,
int is_64bit_p) int is_64bit_p)
{ {

2
gdb/nat/aarch64-linux.h
View file

@ -122,7 +122,7 @@ void aarch64_linux_prepare_to_resume (struct lwp_info *lwp);
void aarch64_linux_new_thread (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, lwpid_t lwpid, int idx, void **base,
int is_64bit_p); int is_64bit_p);

2
gdb/xtensa-linux-nat.c
View file

@ -286,7 +286,7 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops,
/* Called by libthread_db. */ /* Called by libthread_db. */
ps_err_e 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) lwpid_t lwpid, int idx, void **base)
{ {
xtensa_elf_gregset_t regs; xtensa_elf_gregset_t regs;