From ee1ad69ccdd586171462c68235793bdf71f0b33d Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Fri, 20 Dec 1991 19:44:16 +0000 Subject: [PATCH] * configure.in, tm-amix.h, tm-i386v4.h, xm-amix.h, xm-i386v4.h: Change svr4 references to sysv4. * source.c: Move declaration of external function index to front of file so it is in scope for all references. * utils.c (error, fatal): Make definitions consistent with defs.h declarations (declared as "volatile void"). --- gdb/ChangeLog | 11 +++++++++++ gdb/configure.in | 12 ++++++------ gdb/tm-amix.h | 2 +- gdb/tm-i386v4.h | 7 ++++++- gdb/utils.c | 7 ++----- gdb/xm-amix.h | 2 +- gdb/xm-i386v4.h | 9 ++++++++- 7 files changed, 35 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index caeea1d10e..c2bbb337a2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +Fri Dec 20 11:36:38 1991 Fred Fish (fnf at cygnus.com) + + * configure.in, tm-amix.h, tm-i386v4.h, xm-amix.h, xm-i386v4.h: + Change svr4 references to sysv4. + + * source.c: Move declaration of external function index to + front of file so it is in scope for all references. + + * utils.c (error, fatal): Make definitions consistent with + defs.h declarations (declared as "volatile void"). + Fri Dec 20 10:55:36 1991 John Gilmore (gnu at cygnus.com) * rs6k-opcode.h: Bugfix sfe and stbrx. By Al Kossow. diff --git a/gdb/configure.in b/gdb/configure.in index 6ea5ce0dc7..fe74bd2e82 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -22,7 +22,7 @@ m68k) cbm) case ${host_os} in amigados) gdb_host=amigados ;; - svr4) gdb_host=amix ;; + sysv4*) gdb_host=amix ;; esac ;; @@ -86,9 +86,9 @@ i386) sequent) gdb_host=symmetry ;; *) case "${host_os}" in - sysv) gdb_host=i386v ;; sysv32) gdb_host=i386v32 ;; - svr4) gdb_host=i386v4 ;; + sysv4*) gdb_host=i386v4 ;; + sysv*) gdb_host=i386v ;; mach) gdb_host=i386mach ;; esac ;; @@ -155,7 +155,7 @@ m68k) cbm) case ${target_os} in amigados) gdb_host=amigados ;; - svr4) gdb_target=amix ;; + sysv4*) gdb_target=amix ;; esac ;; hp) @@ -243,9 +243,9 @@ i386) sequent) gdb_target=symmetry ;; *) case "${target_os}" in - sysv) gdb_target=i386v ;; sysv32) gdb_target=i386v32 ;; - svr4) gdb_target=i386v4 ;; + sysv4*) gdb_target=i386v4 ;; + sysv*) gdb_target=i386v ;; mach) gdb_target=i386mach ;; coff) gdb_target=i386v ;; aout) gdb_target=i386aout ;; diff --git a/gdb/tm-amix.h b/gdb/tm-amix.h index 635d3b38ef..e13fc89530 100644 --- a/gdb/tm-amix.h +++ b/gdb/tm-amix.h @@ -43,5 +43,5 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define FRAME_CHAIN_VALID_ALTERNATE -#include "tm-svr4.h" +#include "tm-sysv4.h" #include "tm-68k.h" diff --git a/gdb/tm-i386v4.h b/gdb/tm-i386v4.h index 33bb75fb60..244e43ea4c 100644 --- a/gdb/tm-i386v4.h +++ b/gdb/tm-i386v4.h @@ -28,9 +28,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ */ #define START_INFERIOR_TRAPS_EXPECTED 2 -#include "tm-svr4.h" +/* Pick up most of what we need from the generic i386 target include file. */ + #include "tm-i386v.h" +/* Pick up more stuff from the generic SVR4 host include file. */ + +#include "tm-sysv4.h" + /* We can't tell how many args there are now that the C compiler delays popping them. */ diff --git a/gdb/utils.c b/gdb/utils.c index bffa2ee9bd..ab48cec6aa 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -45,9 +45,6 @@ extern char *realloc(); #define ISATTY(FP) (isatty (fileno (FP))) #endif -void error (); -void fatal (); - /* Chain of cleanup actions established with make_cleanup, to be executed if an error happens. */ @@ -213,7 +210,7 @@ warning (va_alist) and the remaining args are passed as arguments to it. */ /* VARARGS */ -void +volatile void error (va_alist) va_dcl { @@ -238,7 +235,7 @@ error (va_alist) The arguments are printed a la printf. */ /* VARARGS */ -void +volatile void fatal (va_alist) va_dcl { diff --git a/gdb/xm-amix.h b/gdb/xm-amix.h index cf55ce10e0..ed65e3983b 100644 --- a/gdb/xm-amix.h +++ b/gdb/xm-amix.h @@ -24,5 +24,5 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Pick up more stuff from the generic SVR4 host include file. */ -#include "xm-svr4.h" +#include "xm-sysv4.h" diff --git a/gdb/xm-i386v4.h b/gdb/xm-i386v4.h index 0b54b59fe7..85d80c833b 100644 --- a/gdb/xm-i386v4.h +++ b/gdb/xm-i386v4.h @@ -24,5 +24,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Pick up more stuff from the generic SVR4 host include file. */ -#include "xm-svr4.h" +#include "xm-sysv4.h" +/* The native AT&T compiler for i386/SVR4 complains about some of the + uses of volatile in the defs.h file. So shut it up by simply defining + volatile away. */ + +#ifndef __GNUC__ +#define volatile /**/ +#endif -- 2.34.1