public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Rainer Orth <ro@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix sol-thread.c compilation on 32-bit Solaris Date: Sun, 20 Nov 2022 13:53:21 +0000 (GMT) [thread overview] Message-ID: <20221120135321.CD96A395B472@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=f1a8d786c37bbe40d0bc2fec618d0e875d043811 commit f1a8d786c37bbe40d0bc2fec618d0e875d043811 Author: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> Date: Sun Nov 20 14:52:09 2022 +0100 Fix sol-thread.c compilation on 32-bit Solaris sol-thread.c fails to compile on 32-bit Solaris: there are several instances of In file included from /vol/src/gnu/gdb/hg/master/local/gdb/../gdbsupport/common-defs.h:203, from /vol/src/gnu/gdb/hg/master/local/gdb/defs.h:28, from /vol/src/gnu/gdb/hg/master/local/gdb/sol-thread.c:51: /vol/src/gnu/gdb/hg/master/local/gdb/sol-thread.c: In member function ‘virtual void sol_thread_target::resume(ptid_t, int, gdb_signal)’: /vol/src/gnu/gdb/hg/master/local/gdb/sol-thread.c:416:20: error: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘ULONGEST’ {aka ‘long long unsigned int’} [-Werror=format=] 416 | warning (_("Specified thread %ld seems to have terminated"), | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /vol/src/gnu/gdb/hg/master/local/gdb/../gdbsupport/gdb_locale.h:28:29: note: in definition of macro ‘_’ 28 | # define _(String) gettext (String) | ^~~~~~ /vol/src/gnu/gdb/hg/master/local/gdb/sol-thread.c:416:40: note: format string is defined here 416 | warning (_("Specified thread %ld seems to have terminated"), | ~~^ | | | long int | %lld Fixed by using pulongest () instead. Tested on i386-pc-solaris2.11, amd64-pc-solaris2.11, sparc-sun-solaris2.11, and sparcv9-sun-solaris2.11 (together with Simon's patch for PR build/29798). Diff: --- gdb/sol-thread.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index 18754f4f93b..c9abb4547ca 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -413,8 +413,8 @@ sol_thread_target::resume (ptid_t ptid, int step, enum gdb_signal signo) if (ptid.pid () == -2) /* Inactive thread. */ error (_("This version of Solaris can't start inactive threads.")); if (info_verbose && ptid.pid () == -1) - warning (_("Specified thread %ld seems to have terminated"), - save_ptid.tid ()); + warning (_("Specified thread %s seems to have terminated"), + pulongest (save_ptid.tid ())); } beneath ()->resume (ptid, step, signo); @@ -435,8 +435,8 @@ sol_thread_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus, if (ptid.pid () == -2) /* Inactive thread. */ error (_("This version of Solaris can't start inactive threads.")); if (info_verbose && ptid.pid () == -1) - warning (_("Specified thread %ld seems to have terminated"), - ptid_for_warning.tid ()); + warning (_("Specified thread %s seems to have terminated"), + pulongest (ptid_for_warning.tid ())); } ptid_t rtnval = beneath ()->wait (ptid, ourstatus, options); @@ -973,14 +973,14 @@ sol_thread_target::pid_to_str (ptid_t ptid) lwp = thread_to_lwp (ptid, -2); if (lwp.pid () == -1) - return string_printf ("Thread %ld (defunct)", - ptid.tid ()); + return string_printf ("Thread %s (defunct)", + pulongest (ptid.tid ())); else if (lwp.pid () != -2) - return string_printf ("Thread %ld (LWP %ld)", - ptid.tid (), lwp.lwp ()); + return string_printf ("Thread %s (LWP %ld)", + pulongest (ptid.tid ()), lwp.lwp ()); else - return string_printf ("Thread %ld ", - ptid.tid ()); + return string_printf ("Thread %s ", + pulongest (ptid.tid ())); } else if (ptid.lwp () != 0) return string_printf ("LWP %ld ", ptid.lwp ());
reply other threads:[~2022-11-20 13:53 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221120135321.CD96A395B472@sourceware.org \ --to=ro@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).