From 3cfa9ec09cbd6742abee95526912269fd2e62a4c Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 6 Jul 2000 17:05:33 +0000
Subject: [PATCH] Reorganized signal names for better architecture support --
 patch thanks to simon wood <simon@mungewell.uklinux.net>  -Erik

---
 kill.c        | 80 +++++++++++++++++++++------------------------------
 procps/kill.c | 80 +++++++++++++++++++++------------------------------
 2 files changed, 64 insertions(+), 96 deletions(-)

diff --git a/kill.c b/kill.c
index 75277d962..a0b93be2b 100644
--- a/kill.c
+++ b/kill.c
@@ -58,76 +58,60 @@ struct signal_name {
 };
 
 const struct signal_name signames[] = {
+	/* Everything, order not important */
 	{"HUP", SIGHUP},
 	{"INT", SIGINT},
 	{"QUIT", SIGQUIT},
 	{"ILL", SIGILL},
 	{"TRAP", SIGTRAP},
 	{"ABRT", SIGABRT},
-#ifndef __alpha__
-	{"IOT", SIGIOT},
-#endif
-#if defined(__sparc__) || defined(__alpha__)
-	{"EMT", SIGEMT},
-#else
-	{"BUS", SIGBUS},
-#endif
 	{"FPE", SIGFPE},
 	{"KILL", SIGKILL},
-#if defined(__sparc__) || defined(__alpha__)
-	{"BUS", SIGBUS},
-#else
-	{"USR1", SIGUSR1},
-#endif
 	{"SEGV", SIGSEGV},
-#if defined(__sparc__) || defined(__alpha__)
-	{"SYS", SIGSYS},
-#else
-	{"USR2", SIGUSR2},
-#endif
 	{"PIPE", SIGPIPE},
 	{"ALRM", SIGALRM},
 	{"TERM", SIGTERM},
-#if defined(__sparc__) || defined(__alpha__)
-	{"URG", SIGURG},
-	{"STOP", SIGSTOP},
-	{"TSTP", SIGTSTP},
-	{"CONT", SIGCONT},
-	{"CHLD", SIGCHLD},
-	{"TTIN", SIGTTIN},
-	{"TTOU", SIGTTOU},
-	{"IO", SIGIO},
-# ifndef __alpha__
-	{"POLL", SIGIO},
-# endif
-	{"XCPU", SIGXCPU},
-	{"XFSZ", SIGXFSZ},
-	{"VTALRM", SIGVTALRM},
-	{"PROF", SIGPROF},
-	{"WINCH", SIGWINCH},
-# ifdef __alpha__
-	{"INFO", SIGINFO},
-# else
-	{"LOST", SIGLOST},
-# endif
+	{"BUS", SIGBUS},
 	{"USR1", SIGUSR1},
 	{"USR2", SIGUSR2},
-#else
-	{"STKFLT", SIGSTKFLT},
-	{"CHLD", SIGCHLD},
-	{"CONT", SIGCONT},
 	{"STOP", SIGSTOP},
-	{"TSTP", SIGTSTP},
+	{"CONT", SIGCONT},
 	{"TTIN", SIGTTIN},
 	{"TTOU", SIGTTOU},
-	{"URG", SIGURG},
+	{"IO", SIGIO},
+	{"TSTP", SIGTSTP},
+	{"CHLD", SIGCHLD},
 	{"XCPU", SIGXCPU},
 	{"XFSZ", SIGXFSZ},
-	{"VTALRM", SIGVTALRM},
 	{"PROF", SIGPROF},
 	{"WINCH", SIGWINCH},
-	{"IO", SIGIO},
+	{"URG", SIGURG},
+	{"VTALRM", SIGVTALRM},
+#ifndef __alpha__
+	/* everything except alpha */
+	{"IOT", SIGIOT},
 	{"POLL", SIGPOLL},
+#endif
+#if defined(__sparc__) || defined(__alpha__) || defined(__mips__)
+	/* everthing except intel */
+	{"EMT", SIGEMT},
+	{"SYS", SIGSYS},
+# ifdef __alpha__
+		/* alpha only */
+		{"LOST", SIGLOST},
+#endif
+#ifdef __sparc__
+		/* space only */
+		{"INFO", SIGINFO},
+#endif
+#ifdef __mips__
+		/* mips only */
+		{"CLD", SIGCLD},
+		{"PWR", SIGPWR},
+#endif
+#else
+	/* intel only */
+	{"STKFLT", SIGSTKFLT},
 	{"PWR", SIGPWR},
 	{"UNUSED", SIGUNUSED},
 #endif
diff --git a/procps/kill.c b/procps/kill.c
index 75277d962..a0b93be2b 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -58,76 +58,60 @@ struct signal_name {
 };
 
 const struct signal_name signames[] = {
+	/* Everything, order not important */
 	{"HUP", SIGHUP},
 	{"INT", SIGINT},
 	{"QUIT", SIGQUIT},
 	{"ILL", SIGILL},
 	{"TRAP", SIGTRAP},
 	{"ABRT", SIGABRT},
-#ifndef __alpha__
-	{"IOT", SIGIOT},
-#endif
-#if defined(__sparc__) || defined(__alpha__)
-	{"EMT", SIGEMT},
-#else
-	{"BUS", SIGBUS},
-#endif
 	{"FPE", SIGFPE},
 	{"KILL", SIGKILL},
-#if defined(__sparc__) || defined(__alpha__)
-	{"BUS", SIGBUS},
-#else
-	{"USR1", SIGUSR1},
-#endif
 	{"SEGV", SIGSEGV},
-#if defined(__sparc__) || defined(__alpha__)
-	{"SYS", SIGSYS},
-#else
-	{"USR2", SIGUSR2},
-#endif
 	{"PIPE", SIGPIPE},
 	{"ALRM", SIGALRM},
 	{"TERM", SIGTERM},
-#if defined(__sparc__) || defined(__alpha__)
-	{"URG", SIGURG},
-	{"STOP", SIGSTOP},
-	{"TSTP", SIGTSTP},
-	{"CONT", SIGCONT},
-	{"CHLD", SIGCHLD},
-	{"TTIN", SIGTTIN},
-	{"TTOU", SIGTTOU},
-	{"IO", SIGIO},
-# ifndef __alpha__
-	{"POLL", SIGIO},
-# endif
-	{"XCPU", SIGXCPU},
-	{"XFSZ", SIGXFSZ},
-	{"VTALRM", SIGVTALRM},
-	{"PROF", SIGPROF},
-	{"WINCH", SIGWINCH},
-# ifdef __alpha__
-	{"INFO", SIGINFO},
-# else
-	{"LOST", SIGLOST},
-# endif
+	{"BUS", SIGBUS},
 	{"USR1", SIGUSR1},
 	{"USR2", SIGUSR2},
-#else
-	{"STKFLT", SIGSTKFLT},
-	{"CHLD", SIGCHLD},
-	{"CONT", SIGCONT},
 	{"STOP", SIGSTOP},
-	{"TSTP", SIGTSTP},
+	{"CONT", SIGCONT},
 	{"TTIN", SIGTTIN},
 	{"TTOU", SIGTTOU},
-	{"URG", SIGURG},
+	{"IO", SIGIO},
+	{"TSTP", SIGTSTP},
+	{"CHLD", SIGCHLD},
 	{"XCPU", SIGXCPU},
 	{"XFSZ", SIGXFSZ},
-	{"VTALRM", SIGVTALRM},
 	{"PROF", SIGPROF},
 	{"WINCH", SIGWINCH},
-	{"IO", SIGIO},
+	{"URG", SIGURG},
+	{"VTALRM", SIGVTALRM},
+#ifndef __alpha__
+	/* everything except alpha */
+	{"IOT", SIGIOT},
 	{"POLL", SIGPOLL},
+#endif
+#if defined(__sparc__) || defined(__alpha__) || defined(__mips__)
+	/* everthing except intel */
+	{"EMT", SIGEMT},
+	{"SYS", SIGSYS},
+# ifdef __alpha__
+		/* alpha only */
+		{"LOST", SIGLOST},
+#endif
+#ifdef __sparc__
+		/* space only */
+		{"INFO", SIGINFO},
+#endif
+#ifdef __mips__
+		/* mips only */
+		{"CLD", SIGCLD},
+		{"PWR", SIGPWR},
+#endif
+#else
+	/* intel only */
+	{"STKFLT", SIGSTKFLT},
 	{"PWR", SIGPWR},
 	{"UNUSED", SIGUNUSED},
 #endif