From 1f04aa626601752ffbb4af60a478a1f1e8e0ad6b Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 7 Sep 2004 21:55:12 +0000 Subject: [PATCH] 2004-09-07 Andrew Cagney * vx-share/wait.h: Delete #ifdef USG. * utils.c (request_quit): Ditto. * tui/tui.c (tui_reset): Ditto. * remote.c: Ditto. * remote-sds.c: Ditto. * remote-rdi.c: Ditto. * mdebugread.c: Ditto. * m68klinux-nat.c: Ditto. * infttrace.c: Ditto. * infptrace.c: Ditto. * i386v-nat.c: Ditto. * exec.c: Ditto. * dbxread.c: Ditto. * core-aout.c: Ditto. --- gdb/ChangeLog | 17 +++++++++++++++++ gdb/core-aout.c | 2 -- gdb/dbxread.c | 2 +- gdb/exec.c | 4 ---- gdb/i386v-nat.c | 4 ---- gdb/infptrace.c | 4 ---- gdb/infttrace.c | 4 ---- gdb/m68klinux-nat.c | 4 ---- gdb/mdebugread.c | 4 ---- gdb/remote-rdi.c | 4 ---- gdb/remote-sds.c | 4 ---- gdb/remote.c | 3 --- gdb/tui/tui.c | 26 ++------------------------ gdb/utils.c | 5 ++--- gdb/vx-share/wait.h | 6 +++--- 15 files changed, 25 insertions(+), 68 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 91d851e12e2..a610ad9838b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,20 @@ +2004-09-07 Andrew Cagney + + * vx-share/wait.h: Delete #ifdef USG. + * utils.c (request_quit): Ditto. + * tui/tui.c (tui_reset): Ditto. + * remote.c: Ditto. + * remote-sds.c: Ditto. + * remote-rdi.c: Ditto. + * mdebugread.c: Ditto. + * m68klinux-nat.c: Ditto. + * infttrace.c: Ditto. + * infptrace.c: Ditto. + * i386v-nat.c: Ditto. + * exec.c: Ditto. + * dbxread.c: Ditto. + * core-aout.c: Ditto. + 2004-09-05 Joel Brobecker * mips-tdep.c (mips_insn16_frame_cache): Fix parameter in call to diff --git a/gdb/core-aout.c b/gdb/core-aout.c index 22469263f50..659c8180f19 100644 --- a/gdb/core-aout.c +++ b/gdb/core-aout.c @@ -41,12 +41,10 @@ #include "regcache.h" /* These are needed on various systems to expand REGISTER_U_ADDR. */ -#ifndef USG #include "gdb_dirent.h" #include #include "gdb_stat.h" #include -#endif #ifndef CORE_REGISTER_ADDR #define CORE_REGISTER_ADDR(regno, regptr) register_addr(regno, regptr) diff --git a/gdb/dbxread.c b/gdb/dbxread.c index e537744338d..5436d4a3cbe 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -37,7 +37,7 @@ #include "defs.h" #include "gdb_string.h" -#if defined(USG) || defined(__CYGNUSCLIB__) +#if defined(__CYGNUSCLIB__) #include #include #endif diff --git a/gdb/exec.c b/gdb/exec.c index e0652fbaec1..4ff345a5bfa 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -33,10 +33,6 @@ #include "value.h" #include "exec.h" -#ifdef USG -#include -#endif - #include #include "readline/readline.h" #include "gdb_string.h" diff --git a/gdb/i386v-nat.c b/gdb/i386v-nat.c index 678eabc346d..bae840626cd 100644 --- a/gdb/i386v-nat.c +++ b/gdb/i386v-nat.c @@ -35,10 +35,6 @@ #include "language.h" #include "gdbcore.h" -#ifdef USG -#include -#endif - #include #include #include diff --git a/gdb/infptrace.c b/gdb/infptrace.c index 0c59d8f481a..fb7736c2fc5 100644 --- a/gdb/infptrace.c +++ b/gdb/infptrace.c @@ -32,10 +32,6 @@ #include "gdb_wait.h" #include "gdb_string.h" -#ifdef USG -#include -#endif - #include #include "gdb_dirent.h" #include diff --git a/gdb/infttrace.c b/gdb/infttrace.c index d62c4bd6803..fcb4d028bd9 100644 --- a/gdb/infttrace.c +++ b/gdb/infttrace.c @@ -46,10 +46,6 @@ #undef NO_FLAGS #endif -#ifdef USG -#include -#endif - #include #include #include diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c index 70a40b70f7d..30a4c9deae8 100644 --- a/gdb/m68klinux-nat.c +++ b/gdb/m68klinux-nat.c @@ -30,10 +30,6 @@ #include "m68k-tdep.h" -#ifdef USG -#include -#endif - #include #include #include diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index c0165aba536..5207b7e3930 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -76,10 +76,6 @@ typedef struct mips_extra_func_info #endif #endif -#ifdef USG -#include -#endif - #include "gdb_stat.h" #include "gdb_string.h" diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c index 50d1fbf7c12..1c14a03b43f 100644 --- a/gdb/remote-rdi.c +++ b/gdb/remote-rdi.c @@ -38,10 +38,6 @@ #include "regcache.h" #include "arm-tdep.h" -#ifdef USG -#include -#endif - #include #include "rdi-share/ardi.h" diff --git a/gdb/remote-sds.c b/gdb/remote-sds.c index 7f16c74666a..5b4b3898adb 100644 --- a/gdb/remote-sds.c +++ b/gdb/remote-sds.c @@ -40,10 +40,6 @@ #include "gdbcore.h" #include "regcache.h" -#ifdef USG -#include -#endif - #include #include "serial.h" diff --git a/gdb/remote.c b/gdb/remote.c index 30ae26dce96..a081064f15f 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -43,9 +43,6 @@ #include #include -#ifdef USG -#include -#endif #include "event-loop.h" #include "event-top.h" diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index d88998a9a80..e9a9b1b99f2 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -485,9 +485,9 @@ tui_reset (void) ** reset the teletype mode bits to a sensible state. ** Copied tset.c */ -#if ! defined (USG) && defined (TIOCGETC) +#if defined (TIOCGETC) struct tchars tbuf; -#endif /* !USG && TIOCGETC */ +#endif /* TIOCGETC */ #ifdef UCB_NTTY struct ltchars ltc; @@ -503,7 +503,6 @@ tui_reset (void) ioctl (FILEDES, TIOCSLTC, <c); } #endif /* UCB_NTTY */ -#ifndef USG #ifdef TIOCGETC ioctl (FILEDES, TIOCGETC, &tbuf); tbuf.t_intrc = CHK (tbuf.t_intrc, CTRL ('?')); @@ -520,27 +519,6 @@ tui_reset (void) #endif /* CBREAK */ | VTDELAY | ALLDELAY); mode.sg_flags |= XTABS | ECHO | CRMOD | ANYP; -#else /*USG */ - ioctl (FILEDES, TCGETA, &mode); - mode.c_cc[VINTR] = CHK (mode.c_cc[VINTR], CTRL ('?')); - mode.c_cc[VQUIT] = CHK (mode.c_cc[VQUIT], CTRL ('\\')); - mode.c_cc[VEOF] = CHK (mode.c_cc[VEOF], CTRL ('D')); - - mode.c_iflag &= ~(IGNBRK | PARMRK | INPCK | INLCR | IGNCR | IUCLC | IXOFF); - mode.c_iflag |= (BRKINT | ISTRIP | ICRNL | IXON); - mode.c_oflag &= ~(OLCUC | OCRNL | ONOCR | ONLRET | OFILL | OFDEL | - NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY); - mode.c_oflag |= (OPOST | ONLCR); - mode.c_cflag &= ~(CSIZE | PARODD | CLOCAL); -#ifndef hp9000s800 - mode.c_cflag |= (CS8 | CREAD); -#else /*hp9000s800 */ - mode.c_cflag |= (CS8 | CSTOPB | CREAD); -#endif /* hp9000s800 */ - mode.c_lflag &= ~(XCASE | ECHONL | NOFLSH); - mode.c_lflag |= (ISIG | ICANON | ECHO | ECHOK); - ioctl (FILEDES, TCSETAW, &mode); -#endif /* USG */ return; } diff --git a/gdb/utils.c b/gdb/utils.c index be99780cf69..e350c25d1af 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -974,9 +974,8 @@ void request_quit (int signo) { quit_flag = 1; - /* Restore the signal handler. Harmless with BSD-style signals, needed - for System V-style signals. So just always do it, rather than worrying - about USG defines and stuff like that. */ + /* Restore the signal handler. Harmless with BSD-style signals, + needed for System V-style signals. */ signal (signo, request_quit); if (immediate_quit) diff --git a/gdb/vx-share/wait.h b/gdb/vx-share/wait.h index cb8d1b5bbaa..f4670c0d050 100644 --- a/gdb/vx-share/wait.h +++ b/gdb/vx-share/wait.h @@ -10,9 +10,9 @@ modification history 01a,05jun90,llk borrowed. */ -/* Define how to access the structure that the wait system call stores. - On many systems, there is a structure defined for this. - But on vanilla-ish USG systems there is not. */ +/* Define how to access the structure that the wait system call + stores. On many systems, there is a structure defined for + this. */ #ifndef HAVE_WAIT_STRUCT #define WAITTYPE int -- 2.30.2