mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 10:03:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix sol-thread.c compilation on 32-bit Solaris

Browse Source 
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).
This commit is contained in:
Rainer Orth 2022-11-20 14:52:09 +01:00
parent abad6c11d0
commit f1a8d786c3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gdb/sol-thread.c
View File

@ -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 ());