From d41401ace01c234f42697e190a2ac95991780626 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Mon, 26 Oct 2015 13:20:12 -0700 Subject: [PATCH] Add some casts for building on musl. gdb/ChangeLog: * linux-thread-db.c (find_new_threads_callback): Cast ti.ti_tid to unsigned long for debug_printf. (thread_db_pid_to_str): Ditto. gdb/gdbserver/ChangeLog: * thread-db.c (find_one_thread): Cast ti.ti_tid to unsigned long for debug_printf. (attach_thread, find_new_threads_callback): Ditto. --- gdb/ChangeLog | 5 +++++ gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/thread-db.c | 9 +++++---- gdb/linux-thread-db.c | 5 +++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8d08d818054..79c8e8ee22f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-10-26 Doug Evans + + * linux-thread-db.c (find_new_threads_callback): Ditto. + (thread_db_pid_to_str): Ditto. + 2015-10-26 Simon Marchi * guile/scm-ports.c (ioscm_make_gdb_stdio_port): Do not pass a diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 1b54dbdc063..4bcd7a5748a 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2015-10-26 Doug Evans + + * thread-db.c (find_one_thread): Cast ti.ti_tid to unsigned long + for debug_printf. + (attach_thread, find_new_threads_callback): Ditto. + 2015-10-23 Antoine Tremblay * mem-break.h (set_breakpoint_data): Remove. diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c index ffe722dcdd4..3df10ff7e04 100644 --- a/gdb/gdbserver/thread-db.c +++ b/gdb/gdbserver/thread-db.c @@ -278,7 +278,7 @@ find_one_thread (ptid_t ptid) if (debug_threads) debug_printf ("Found thread %ld (LWP %d)\n", - ti.ti_tid, ti.ti_lid); + (unsigned long) ti.ti_tid, ti.ti_lid); if (lwpid != ti.ti_lid) { @@ -319,12 +319,12 @@ attach_thread (const td_thrhandle_t *th_p, td_thrinfo_t *ti_p) if (debug_threads) debug_printf ("Attaching to thread %ld (LWP %d)\n", - ti_p->ti_tid, ti_p->ti_lid); + (unsigned long) ti_p->ti_tid, ti_p->ti_lid); err = linux_attach_lwp (ptid); if (err != 0) { warning ("Could not attach to thread %ld (LWP %d): %s\n", - ti_p->ti_tid, ti_p->ti_lid, + (unsigned long) ti_p->ti_tid, ti_p->ti_lid, linux_ptrace_attach_fail_reason_string (ptid, err)); return 0; } @@ -392,7 +392,8 @@ find_new_threads_callback (const td_thrhandle_t *th_p, void *data) glibc PR17707. */ if (debug_threads) debug_printf ("thread_db: skipping exited and " - "joined thread (0x%lx)\n", ti.ti_tid); + "joined thread (0x%lx)\n", + (unsigned long) ti.ti_tid); return 0; } diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c index 66e9595b67b..41db29a81fc 100644 --- a/gdb/linux-thread-db.c +++ b/gdb/linux-thread-db.c @@ -1585,7 +1585,8 @@ find_new_threads_callback (const td_thrhandle_t *th_p, void *data) if (libthread_db_debug) fprintf_unfiltered (gdb_stdlog, "thread_db: skipping exited and " - "joined thread (0x%lx)\n", ti.ti_tid); + "joined thread (0x%lx)\n", + (unsigned long) ti.ti_tid); return 0; } @@ -1816,7 +1817,7 @@ thread_db_pid_to_str (struct target_ops *ops, ptid_t ptid) tid = thread_info->priv->tid; snprintf (buf, sizeof (buf), "Thread 0x%lx (LWP %ld)", - tid, ptid_get_lwp (ptid)); + (unsigned long) tid, ptid_get_lwp (ptid)); return buf; } -- 2.30.2