2007-12-16 Daniel Jacobowitz <dan@codesourcery.com>

            Joseph Myers  <joseph@codesourcery.com>

	* configure.ac: Check for *-*-solaris2.1[[0-9]]* instead of
	*-*-solaris2.1[[0-9]].
	* configure: Regenerate.
	* procfs.c (proc_set_current_signal): If redelivering a signal,
	reuse the current siginfo if possible.

testsuite:
	* gdb.base/siginfo-addr.exp, gdb.base/siginfo-addr.c: New.

7 files changed, 184 insertions, 6 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5337c5e..5836d7c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-16  Daniel Jacobowitz  <dan@codesourcery.com>
+            Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac: Check for *-*-solaris2.1[[0-9]]* instead of
+	*-*-solaris2.1[[0-9]].
+	* configure: Regenerate.
+	* procfs.c (proc_set_current_signal): If redelivering a signal,
+	reuse the current siginfo if possible.
+
 2007-12-16  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	* f-typeprint.c (print_equivalent_f77_float_type): Remove function.
diff --git a/gdb/configure b/gdb/configure
index b84d894..eb26064 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -20418,7 +20418,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
       ;;
-  *-*-solaris2.[6789] | *-*-solaris2.1[0-9])
+  *-*-solaris2.[6789] | *-*-solaris2.1[0-9]*)
 
 cat >>confdefs.h <<\_ACEOF
 #define NEW_PROC_API 1
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 107fdd6..fe9564d 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -828,7 +828,7 @@ if test "${target}" = "${host}"; then
       [Define if you want to use new multi-fd /proc interface
        (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros).])
       ;;
-  *-*-solaris2.[[6789]] | *-*-solaris2.1[[0-9]])
+  *-*-solaris2.[[6789]] | *-*-solaris2.1[[0-9]]*)
       AC_DEFINE(NEW_PROC_API, 1,
       [Define if you want to use new multi-fd /proc interface
        (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros).])
diff --git a/gdb/procfs.c b/gdb/procfs.c
index e288459..4bd1fa8 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -2485,6 +2485,8 @@ proc_set_current_signal (procinfo *pi, int signo)
     char sinfo[sizeof (gdb_siginfo_t)];
   } arg;
   gdb_siginfo_t *mysinfo;
+  ptid_t wait_ptid;
+  struct target_waitstatus wait_status;
 
   /*
    * We should never have to apply this operation to any procinfo
@@ -2508,10 +2510,31 @@ proc_set_current_signal (procinfo *pi, int signo)
 
   /* The pointer is just a type alias.  */
   mysinfo = (gdb_siginfo_t *) &arg.sinfo;
-  mysinfo->si_signo = signo;
-  mysinfo->si_code  = 0;
-  mysinfo->si_pid   = getpid ();       /* ?why? */
-  mysinfo->si_uid   = getuid ();       /* ?why? */
+  get_last_target_status (&wait_ptid, &wait_status);
+  if (ptid_equal (wait_ptid, inferior_ptid)
+      && wait_status.kind == TARGET_WAITKIND_STOPPED
+      && wait_status.value.sig == target_signal_from_host (signo)
+      && proc_get_status (pi)
+#ifdef NEW_PROC_API
+      && pi->prstatus.pr_lwp.pr_info.si_signo == signo
+#else
+      && pi->prstatus.pr_info.si_signo == signo
+#endif
+      )
+    /* Use the siginfo associated with the signal being
+       redelivered.  */
+#ifdef NEW_PROC_API
+    memcpy (mysinfo, &pi->prstatus.pr_lwp.pr_info, sizeof (gdb_siginfo_t));
+#else
+    memcpy (mysinfo, &pi->prstatus.pr_info, sizeof (gdb_siginfo_t));
+#endif
+  else
+    {
+      mysinfo->si_signo = signo;
+      mysinfo->si_code  = 0;
+      mysinfo->si_pid   = getpid ();       /* ?why? */
+      mysinfo->si_uid   = getuid ();       /* ?why? */
+    }
 
 #ifdef NEW_PROC_API
   arg.cmd = PCSSIG;
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 41f52ab..f8e8daf 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-16  Daniel Jacobowitz  <dan@codesourcery.com>
+            Joseph Myers  <joseph@codesourcery.com>
+
+	* gdb.base/siginfo-addr.exp, gdb.base/siginfo-addr.c: New.
+
 2007-12-14  Vladimir Prus  <vladimir@codesourcery.com>
 	
 	* gdb.mi/mi-pending.exp: New.
diff --git a/gdb/testsuite/gdb.base/siginfo-addr.c b/gdb/testsuite/gdb.base/siginfo-addr.c
new file mode 100644
index 0000000..c1a0095
--- /dev/null
+++ b/gdb/testsuite/gdb.base/siginfo-addr.c
@@ -0,0 +1,68 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2004, 2007 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <unistd.h>
+
+static void *p;
+
+static void
+handler (int sig, siginfo_t *info, void *context)
+{
+  if (info->si_addr == p)
+    printf ("Correct si_addr value.\n");
+  else
+    printf ("Got si_addr = %p, expected %p.\n", info->si_addr, p);
+  _exit (0);
+}
+
+int
+main (void)
+{
+  /* Set up unwritable memory.  */
+  {
+    size_t len;
+    len = sysconf(_SC_PAGESIZE);
+    p = mmap (0, len, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
+    if (p == MAP_FAILED)
+      {
+	perror ("mmap");
+	return 1;
+      }
+  }
+  /* Set up the signal handler.  */
+  {
+    struct sigaction action;
+    memset (&action, 0, sizeof (action));
+    action.sa_sigaction = handler;
+    action.sa_flags |= SA_SIGINFO;
+    if (sigaction (SIGSEGV, &action, NULL))
+      {
+	perror ("sigaction");
+	return 1;
+      }
+  }
+  /* Trigger SIGSEGV.  */
+  *(int *)p = 0;
+  return 0;
+}
diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp
new file mode 100644
index 0000000..761d1d6
--- /dev/null
+++ b/gdb/testsuite/gdb.base/siginfo-addr.exp
@@ -0,0 +1,73 @@
+# Copyright 2004, 2007 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# The program siginfo-addr.c arranges for a signal handler registered
+# using sigaction's sa_sigaction / SA_SIGINFO to be called with
+# si_addr filled in.
+
+# This test confirms that the si_addr value is correct rather than
+# having been corrupted when GDB passed the signal on to the handler.
+
+if [target_info exists gdb,nosignals] {
+    verbose "Skipping siginfo-addr.exp because of nosignals."
+    continue
+}
+
+if [gdb_skip_stdio_test "siginfo-addr.exp"] {
+    continue
+}
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+set testfile siginfo-addr
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+    untested "Couldn't compile ${srcfile}.c"
+    return -1
+}
+
+# get things started
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+gdb_test "display/i \$pc"
+
+# Advance to main
+if { ![runto_main] } then {
+    gdb_suppress_tests;
+}
+
+# Run to the signal.
+gdb_test "continue" ".*Program received signal SIGSEGV.*" "continue to signal"
+
+# Check for correct si_addr.
+set test "program exit"
+gdb_test_multiple "continue" "${test}" {
+    -re "Correct si_addr" {
+	pass "si_addr value"
+    }
+    -re "Got si_addr" {
+	fail "si_addr value"
+    }
+}