OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove preprocessor conditionals for ANSI-standard signals 

The six signals SIGINT, SIGILL, SIGABRT, SIGFPE, SIGSEGV and SIGTERM
are ANSI-standard and thus guaranteed to be available.  This patch
removes all preprocessor conditionals relating to these symbols.

gdb/
2014-06-06  Gary Benson  <gbenson@redhat.com>

	* common/signals.c: Remove preprocessor conditionals for
	always-defined signals SIGINT, SIGILL, SIGABRT, SIGFPE,
	SIGSEGV and SIGTERM.
	* proc-events.c: Likewise.

gdb/testsuite/
2014-06-06  Gary Benson  <gbenson@redhat.com>

	* gdb.base/call-signals.c: Remove preprocessor conditionals
	for always-defined signals SIGINT, SIGILL, SIGABRT, SIGFPE,
	SIGSEGV and SIGTERM.
	* gdb.base/sigall.c: Likewise.
	* gdb.base/unwindonsignal.c: Likewise.
	* gdb.reverse/sigall-reverse.c: Likewise.
This commit is contained in:
Gary Benson 2014-06-06 10:32:12 +01:00
parent adcc0a31cc
commit 73ba372ccf
8 changed files with 20 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2014-06-06 Gary Benson <gbenson@redhat.com>
* common/signals.c: Remove preprocessor conditionals for
always-defined signals SIGINT, SIGILL, SIGABRT, SIGFPE,
SIGSEGV and SIGTERM.
* proc-events.c: Likewise.
2014-06-06 Markus Metzger <markus.t.metzger@intel.com> 2014-06-06 Markus Metzger <markus.t.metzger@intel.com>
* symfile.c (symfile_free_objfile): Remove restriction to * symfile.c (symfile_free_objfile): Remove restriction to

24
gdb/common/signals.c
View File

@ -131,34 +131,26 @@ gdb_signal_from_host (int hostsig)
if (hostsig == SIGHUP) if (hostsig == SIGHUP)
return GDB_SIGNAL_HUP; return GDB_SIGNAL_HUP;
#endif #endif
#if defined (SIGINT)
if (hostsig == SIGINT) if (hostsig == SIGINT)
return GDB_SIGNAL_INT; return GDB_SIGNAL_INT;
#endif
#if defined (SIGQUIT) #if defined (SIGQUIT)
if (hostsig == SIGQUIT) if (hostsig == SIGQUIT)
return GDB_SIGNAL_QUIT; return GDB_SIGNAL_QUIT;
#endif #endif
#if defined (SIGILL)
if (hostsig == SIGILL) if (hostsig == SIGILL)
return GDB_SIGNAL_ILL; return GDB_SIGNAL_ILL;
#endif
#if defined (SIGTRAP) #if defined (SIGTRAP)
if (hostsig == SIGTRAP) if (hostsig == SIGTRAP)
return GDB_SIGNAL_TRAP; return GDB_SIGNAL_TRAP;
#endif #endif
#if defined (SIGABRT)
if (hostsig == SIGABRT) if (hostsig == SIGABRT)
return GDB_SIGNAL_ABRT; return GDB_SIGNAL_ABRT;
#endif
#if defined (SIGEMT) #if defined (SIGEMT)
if (hostsig == SIGEMT) if (hostsig == SIGEMT)
return GDB_SIGNAL_EMT; return GDB_SIGNAL_EMT;
#endif #endif
#if defined (SIGFPE)
if (hostsig == SIGFPE) if (hostsig == SIGFPE)
return GDB_SIGNAL_FPE; return GDB_SIGNAL_FPE;
#endif
#if defined (SIGKILL) #if defined (SIGKILL)
if (hostsig == SIGKILL) if (hostsig == SIGKILL)
return GDB_SIGNAL_KILL; return GDB_SIGNAL_KILL;
@ -167,10 +159,8 @@ gdb_signal_from_host (int hostsig)
if (hostsig == SIGBUS) if (hostsig == SIGBUS)
return GDB_SIGNAL_BUS; return GDB_SIGNAL_BUS;
#endif #endif
#if defined (SIGSEGV)
if (hostsig == SIGSEGV) if (hostsig == SIGSEGV)
return GDB_SIGNAL_SEGV; return GDB_SIGNAL_SEGV;
#endif
#if defined (SIGSYS) #if defined (SIGSYS)
if (hostsig == SIGSYS) if (hostsig == SIGSYS)
return GDB_SIGNAL_SYS; return GDB_SIGNAL_SYS;
@ -183,10 +173,8 @@ gdb_signal_from_host (int hostsig)
if (hostsig == SIGALRM) if (hostsig == SIGALRM)
return GDB_SIGNAL_ALRM; return GDB_SIGNAL_ALRM;
#endif #endif
#if defined (SIGTERM)
if (hostsig == SIGTERM) if (hostsig == SIGTERM)
return GDB_SIGNAL_TERM; return GDB_SIGNAL_TERM;
#endif
#if defined (SIGUSR1) #if defined (SIGUSR1)
if (hostsig == SIGUSR1) if (hostsig == SIGUSR1)
return GDB_SIGNAL_USR1; return GDB_SIGNAL_USR1;
@ -388,34 +376,26 @@ do_gdb_signal_to_host (enum gdb_signal oursig,
case GDB_SIGNAL_HUP: case GDB_SIGNAL_HUP:
return SIGHUP; return SIGHUP;
#endif #endif
#if defined (SIGINT)
case GDB_SIGNAL_INT: case GDB_SIGNAL_INT:
return SIGINT; return SIGINT;
#endif
#if defined (SIGQUIT) #if defined (SIGQUIT)
case GDB_SIGNAL_QUIT: case GDB_SIGNAL_QUIT:
return SIGQUIT; return SIGQUIT;
#endif #endif
#if defined (SIGILL)
case GDB_SIGNAL_ILL: case GDB_SIGNAL_ILL:
return SIGILL; return SIGILL;
#endif
#if defined (SIGTRAP) #if defined (SIGTRAP)
case GDB_SIGNAL_TRAP: case GDB_SIGNAL_TRAP:
return SIGTRAP; return SIGTRAP;
#endif #endif
#if defined (SIGABRT)
case GDB_SIGNAL_ABRT: case GDB_SIGNAL_ABRT:
return SIGABRT; return SIGABRT;
#endif
#if defined (SIGEMT) #if defined (SIGEMT)
case GDB_SIGNAL_EMT: case GDB_SIGNAL_EMT:
return SIGEMT; return SIGEMT;
#endif #endif
#if defined (SIGFPE)
case GDB_SIGNAL_FPE: case GDB_SIGNAL_FPE:
return SIGFPE; return SIGFPE;
#endif
#if defined (SIGKILL) #if defined (SIGKILL)
case GDB_SIGNAL_KILL: case GDB_SIGNAL_KILL:
return SIGKILL; return SIGKILL;
@ -424,10 +404,8 @@ do_gdb_signal_to_host (enum gdb_signal oursig,
case GDB_SIGNAL_BUS: case GDB_SIGNAL_BUS:
return SIGBUS; return SIGBUS;
#endif #endif
#if defined (SIGSEGV)
case GDB_SIGNAL_SEGV: case GDB_SIGNAL_SEGV:
return SIGSEGV; return SIGSEGV;
#endif
#if defined (SIGSYS) #if defined (SIGSYS)
case GDB_SIGNAL_SYS: case GDB_SIGNAL_SYS:
return SIGSYS; return SIGSYS;
@ -440,10 +418,8 @@ do_gdb_signal_to_host (enum gdb_signal oursig,
case GDB_SIGNAL_ALRM: case GDB_SIGNAL_ALRM:
return SIGALRM; return SIGALRM;
#endif #endif
#if defined (SIGTERM)
case GDB_SIGNAL_TERM: case GDB_SIGNAL_TERM:
return SIGTERM; return SIGTERM;
#endif
#if defined (SIGUSR1) #if defined (SIGUSR1)
case GDB_SIGNAL_USR1: case GDB_SIGNAL_USR1:
return SIGUSR1; return SIGUSR1;

12
gdb/proc-events.c
View File

@ -1404,39 +1404,29 @@ static struct trans signal_table[] =
#ifdef SIGHUP #ifdef SIGHUP
{ SIGHUP, "SIGHUP", "Hangup" }, { SIGHUP, "SIGHUP", "Hangup" },
#endif #endif
#ifdef SIGINT
{ SIGINT, "SIGINT", "Interrupt (rubout)" }, { SIGINT, "SIGINT", "Interrupt (rubout)" },
#endif
#ifdef SIGQUIT #ifdef SIGQUIT
{ SIGQUIT, "SIGQUIT", "Quit (ASCII FS)" }, { SIGQUIT, "SIGQUIT", "Quit (ASCII FS)" },
#endif #endif
#ifdef SIGILL
{ SIGILL, "SIGILL", "Illegal instruction" }, /* not reset when caught */ { SIGILL, "SIGILL", "Illegal instruction" }, /* not reset when caught */
#endif
#ifdef SIGTRAP #ifdef SIGTRAP
{ SIGTRAP, "SIGTRAP", "Trace trap" }, /* not reset when caught */ { SIGTRAP, "SIGTRAP", "Trace trap" }, /* not reset when caught */
#endif #endif
#ifdef SIGABRT
{ SIGABRT, "SIGABRT", "used by abort()" }, /* replaces SIGIOT */ { SIGABRT, "SIGABRT", "used by abort()" }, /* replaces SIGIOT */
#endif
#ifdef SIGIOT #ifdef SIGIOT
{ SIGIOT, "SIGIOT", "IOT instruction" }, { SIGIOT, "SIGIOT", "IOT instruction" },
#endif #endif
#ifdef SIGEMT #ifdef SIGEMT
{ SIGEMT, "SIGEMT", "EMT instruction" }, { SIGEMT, "SIGEMT", "EMT instruction" },
#endif #endif
#ifdef SIGFPE
{ SIGFPE, "SIGFPE", "Floating point exception" }, { SIGFPE, "SIGFPE", "Floating point exception" },
#endif
#ifdef SIGKILL #ifdef SIGKILL
{ SIGKILL, "SIGKILL", "Kill" }, /* Solaris: cannot be caught/ignored */ { SIGKILL, "SIGKILL", "Kill" }, /* Solaris: cannot be caught/ignored */
#endif #endif
#ifdef SIGBUS #ifdef SIGBUS
{ SIGBUS, "SIGBUS", "Bus error" }, { SIGBUS, "SIGBUS", "Bus error" },
#endif #endif
#ifdef SIGSEGV
{ SIGSEGV, "SIGSEGV", "Segmentation violation" }, { SIGSEGV, "SIGSEGV", "Segmentation violation" },
#endif
#ifdef SIGSYS #ifdef SIGSYS
{ SIGSYS, "SIGSYS", "Bad argument to system call" }, { SIGSYS, "SIGSYS", "Bad argument to system call" },
#endif #endif
@ -1446,9 +1436,7 @@ static struct trans signal_table[] =
#ifdef SIGALRM #ifdef SIGALRM
{ SIGALRM, "SIGALRM", "Alarm clock" }, { SIGALRM, "SIGALRM", "Alarm clock" },
#endif #endif
#ifdef SIGTERM
{ SIGTERM, "SIGTERM", "Software termination signal from kill" }, { SIGTERM, "SIGTERM", "Software termination signal from kill" },
#endif
#ifdef SIGUSR1 #ifdef SIGUSR1
{ SIGUSR1, "SIGUSR1", "User defined signal 1" }, { SIGUSR1, "SIGUSR1", "User defined signal 1" },
#endif #endif

9
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
2014-06-06 Gary Benson <gbenson@redhat.com>
* gdb.base/call-signals.c: Remove preprocessor conditionals
for always-defined signals SIGINT, SIGILL, SIGABRT, SIGFPE,
SIGSEGV and SIGTERM.
* gdb.base/sigall.c: Likewise.
* gdb.base/unwindonsignal.c: Likewise.
* gdb.reverse/sigall-reverse.c: Likewise.
2014-06-06 Yao Qi <yao@codesourcery.com> 2014-06-06 Yao Qi <yao@codesourcery.com>
* gdb.base/hbreak-unmapped.exp: Read memory at address 0. If * gdb.base/hbreak-unmapped.exp: Read memory at address 0. If

2
gdb/testsuite/gdb.base/call-signals.c
View File

@ -31,9 +31,7 @@ void
gen_signal () gen_signal ()
{ {
/* According to sigall.exp, SIGABRT is always supported. */ /* According to sigall.exp, SIGABRT is always supported. */
#ifdef SIGABRT
kill (getpid (), SIGABRT); kill (getpid (), SIGABRT);
#endif
/* If we get here we couldn't generate a signal, tell dejagnu. */ /* If we get here we couldn't generate a signal, tell dejagnu. */
printf ("no signal\n"); printf ("no signal\n");
} }

18
gdb/testsuite/gdb.base/sigall.c
View File

@ -819,11 +819,7 @@ return 0;
int int
gen_ILL () gen_ILL ()
{ {
#ifdef SIGILL
kill (getpid (), SIGILL); kill (getpid (), SIGILL);
#else
handle_ILL (0);
#endif
return 0; return 0;
} }
@ -874,11 +870,7 @@ return 0;
int int
gen_SEGV () gen_SEGV ()
{ {
#ifdef SIGSEGV
kill (getpid (), SIGSEGV); kill (getpid (), SIGSEGV);
#else
handle_SEGV (0);
#endif
return 0; return 0;
} }
@ -1050,7 +1042,7 @@ return 0;
int int
gen_LOST () gen_LOST ()
{ {
#if defined(SIGLOST) && (!defined(SIGABRT) || SIGLOST != SIGABRT) #if defined(SIGLOST) && SIGLOST != SIGABRT
kill (getpid (), SIGLOST); kill (getpid (), SIGLOST);
#else #else
handle_LOST (0); handle_LOST (0);
@ -1593,21 +1585,15 @@ main ()
#ifdef SIGQUIT #ifdef SIGQUIT
signal (SIGQUIT, handle_QUIT); signal (SIGQUIT, handle_QUIT);
#endif #endif
#ifdef SIGILL
signal (SIGILL, handle_ILL); signal (SIGILL, handle_ILL);
#endif
#ifdef SIGEMT #ifdef SIGEMT
signal (SIGEMT, handle_EMT); signal (SIGEMT, handle_EMT);
#endif #endif
#ifdef SIGFPE
signal (SIGFPE, handle_FPE); signal (SIGFPE, handle_FPE);
#endif
#ifdef SIGBUS #ifdef SIGBUS
signal (SIGBUS, handle_BUS); signal (SIGBUS, handle_BUS);
#endif #endif
#ifdef SIGSEGV
signal (SIGSEGV, handle_SEGV); signal (SIGSEGV, handle_SEGV);
#endif
#ifdef SIGSYS #ifdef SIGSYS
signal (SIGSYS, handle_SYS); signal (SIGSYS, handle_SYS);
#endif #endif
@ -1653,7 +1639,7 @@ main ()
#ifdef SIGWINCH #ifdef SIGWINCH
signal (SIGWINCH, handle_WINCH); signal (SIGWINCH, handle_WINCH);
#endif #endif
#if defined(SIGLOST) && (!defined(SIGABRT) || SIGLOST != SIGABRT) #if defined(SIGLOST) && SIGLOST != SIGABRT
signal (SIGLOST, handle_LOST); signal (SIGLOST, handle_LOST);
#endif #endif
#ifdef SIGUSR1 #ifdef SIGUSR1

2
gdb/testsuite/gdb.base/unwindonsignal.c
View File

@ -25,9 +25,7 @@ void
gen_signal () gen_signal ()
{ {
/* According to sigall.exp, SIGABRT is always supported. */ /* According to sigall.exp, SIGABRT is always supported. */
#ifdef SIGABRT
kill (getpid (), SIGABRT); kill (getpid (), SIGABRT);
#endif
/* If we get here we couldn't generate a signal, tell dejagnu. */ /* If we get here we couldn't generate a signal, tell dejagnu. */
printf ("no signal\n"); printf ("no signal\n");
} }

18
gdb/testsuite/gdb.reverse/sigall-reverse.c
View File

@ -410,11 +410,7 @@ return 0;
int int
gen_ILL (void) gen_ILL (void)
{ {
#ifdef SIGILL
kill (getpid (), SIGILL); kill (getpid (), SIGILL);
#else
handle_ILL (0);
#endif
return 0; return 0;
} }
@ -465,11 +461,7 @@ return 0;
int int
gen_SEGV (void) gen_SEGV (void)
{ {
#ifdef SIGSEGV
kill (getpid (), SIGSEGV); kill (getpid (), SIGSEGV);
#else
handle_SEGV (0);
#endif
return 0; return 0;
} }
@ -641,7 +633,7 @@ return 0;
int int
gen_LOST (void) gen_LOST (void)
{ {
#if defined(SIGLOST) && (!defined(SIGABRT) || SIGLOST != SIGABRT) #if defined(SIGLOST) && SIGLOST != SIGABRT
kill (getpid (), SIGLOST); kill (getpid (), SIGLOST);
#else #else
handle_LOST (0); handle_LOST (0);
@ -1183,21 +1175,15 @@ main ()
#ifdef SIGQUIT #ifdef SIGQUIT
signal (SIGQUIT, handle_QUIT); signal (SIGQUIT, handle_QUIT);
#endif #endif
#ifdef SIGILL
signal (SIGILL, handle_ILL); signal (SIGILL, handle_ILL);
#endif
#ifdef SIGEMT #ifdef SIGEMT
signal (SIGEMT, handle_EMT); signal (SIGEMT, handle_EMT);
#endif #endif
#ifdef SIGFPE
signal (SIGFPE, handle_FPE); signal (SIGFPE, handle_FPE);
#endif
#ifdef SIGBUS #ifdef SIGBUS
signal (SIGBUS, handle_BUS); signal (SIGBUS, handle_BUS);
#endif #endif
#ifdef SIGSEGV
signal (SIGSEGV, handle_SEGV); signal (SIGSEGV, handle_SEGV);
#endif
#ifdef SIGSYS #ifdef SIGSYS
signal (SIGSYS, handle_SYS); signal (SIGSYS, handle_SYS);
#endif #endif
@ -1243,7 +1229,7 @@ main ()
#ifdef SIGWINCH #ifdef SIGWINCH
signal (SIGWINCH, handle_WINCH); signal (SIGWINCH, handle_WINCH);
#endif #endif
#if defined(SIGLOST) && (!defined(SIGABRT) || SIGLOST != SIGABRT) #if defined(SIGLOST) && SIGLOST != SIGABRT
signal (SIGLOST, handle_LOST); signal (SIGLOST, handle_LOST);
#endif #endif
#ifdef SIGUSR1 #ifdef SIGUSR1