From: Peter Schauer <Peter.Schauer@mytum.de>
Date: Sun, 19 Feb 1995 19:08:34 +0000 (+0000)
Subject: Sun Feb 19 11:05:28 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f5de4904552e26265371b02d35cdd635a502c775;p=binutils-gdb.git

Sun Feb 19 11:05:28 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)

	* procfs.c (unconditionally_kill_inferior):  Don't issue a PIOCKILL
	in addition to a PIOCSSIG to kill the inferior.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1bc7ccb0eba..b0972d8168d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 19 11:05:28 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
+
+	* procfs.c (unconditionally_kill_inferior):  Don't issue a PIOCKILL
+	in addition to a PIOCSSIG to kill the inferior.
+
 Thu Feb 16 15:06:12 1995  Per Bothner  <bothner@kalessin.cygnus.com>
 
 	* parse.c (follow_types):  Given (TYPE[]) (i.e. with no length),
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 1897bf421d4..2e8e11f80bc 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -1250,12 +1250,11 @@ unconditionally_kill_inferior (pi)
   ppid = pi->prstatus.pr_ppid;
 
   signo = SIGKILL;
-  ioctl (pi->fd, PIOCKILL, &signo);
 
 #ifdef PROCFS_NEED_PIOCSSIG_FOR_KILL
-  /* Alpha OSF/1 procfs needs an additional PIOCSSIG call with
-     a SIGKILL signal to kill the inferior, otherwise it might remain
-     stopped with a pending SIGKILL.
+  /* Alpha OSF/1 procfs needs a PIOCSSIG call with a SIGKILL signal
+     to kill the inferior, otherwise it might remain stopped with a
+     pending SIGKILL.
      We do not check the result of the PIOCSSIG, the inferior might have
      died already.  */
   {
@@ -1269,6 +1268,8 @@ unconditionally_kill_inferior (pi)
     newsiginfo.si_uid = getuid ();
     ioctl (pi->fd, PIOCSSIG, &newsiginfo);
   }
+#else
+  ioctl (pi->fd, PIOCKILL, &signo);
 #endif
 
   close_proc_file (pi);