From: Tom Tromey <tom@tromey.com>
Date: Mon, 16 Dec 2024 16:12:48 +0000 (-0700)
Subject: Use correct type for saved signal handler
X-Git-Tag: gdb-16-branchpoint~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a8cc0983ae3b954cba68dc874b0b0e738347e79;p=thirdparty%2Fbinutils-gdb.git

Use correct type for saved signal handler

A user noticed that the sim assigns the result of a call to 'signal'
to a variable like:

  RETSIGTYPE (*prev_sigint) ();

However, it's more correct to use (int) here.

This patch fixes the error.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32466
Approved-By: Andrew Burgess <aburgess@redhat.com>
---

diff --git a/sim/common/dv-sockser.c b/sim/common/dv-sockser.c
index db81233e25b..e7664254a4e 100644
--- a/sim/common/dv-sockser.c
+++ b/sim/common/dv-sockser.c
@@ -175,7 +175,7 @@ dv_sockser_init (SIM_DESC sd)
      ??? Need a central signal management module.  */
 #ifdef SIGPIPE
   {
-    RETSIGTYPE (*orig) ();
+    RETSIGTYPE (*orig) (int);
     orig = signal (SIGPIPE, SIG_IGN);
     /* If a handler is already set up, don't mess with it.  */
     if (orig != SIG_DFL && orig != SIG_IGN)
diff --git a/sim/common/nrun.c b/sim/common/nrun.c
index 5dd3bc284bd..fc63baeb8a7 100644
--- a/sim/common/nrun.c
+++ b/sim/common/nrun.c
@@ -64,7 +64,7 @@ main (int argc, char **argv)
   enum sim_stop reason;
   int sigrc = 0;
   int single_step = 0;
-  RETSIGTYPE (*prev_sigint) ();
+  RETSIGTYPE (*prev_sigint) (int);
 
   myname = lbasename (argv[0]);
 
diff --git a/sim/ppc/main.c b/sim/ppc/main.c
index aa1c85e0af9..987e89ea32a 100644
--- a/sim/ppc/main.c
+++ b/sim/ppc/main.c
@@ -289,7 +289,7 @@ main(int argc, char * const *argv)
   psim_stack(simulation, argv, environ);
 
   {
-    RETSIGTYPE (*prev) ();
+    RETSIGTYPE (*prev) (int);
     prev = signal(SIGINT, cntrl_c);
     psim_run(simulation);
     signal(SIGINT, prev);