From fc61e9eeec88f29c61c9bf41e55c415aaf562251 Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Fri, 18 Jun 1993 02:32:27 +0000 Subject: [PATCH] * Makefile.in (INTERNAL_CFLAGS): Include ../include as well as ${srcdir}/../include. * config/m88k/xm-delta88.h: Comment out unused defines which conflict with system headers. * printcmd.c (printf_command): Cast second arg to vprintf to PTR. Use VPRINTF macro if defined. * config/m88k/xm-delta88.h: Define VPRINTF. Include . Define TIOC{GETC,GLTC}_BROKEN. * m88k-nat.c: Uncomment include of . * main.c: Rename initialize_{main,cmd_lists,history} to init_* to make things easier on munch (apparently this matters on the delta88 with svr3). --- gdb/ChangeLog | 22 ++++++++++++++++------ gdb/Makefile.in | 3 ++- gdb/m88k-nat.c | 2 +- gdb/main.c | 18 +++++++++--------- gdb/printcmd.c | 7 ++++++- 5 files changed, 34 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b5a6bfe5e5..62fbdd0429 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,19 @@ -<<<<<<< ChangeLog -<<<<<<< ChangeLog +Thu Jun 17 17:29:30 1993 Jim Kingdon (kingdon@lisa.cygnus.com) + + * Makefile.in (INTERNAL_CFLAGS): Include ../include as well as + ${srcdir}/../include. + + * config/m88k/xm-delta88.h: Comment out unused defines which conflict + with system headers. + * printcmd.c (printf_command): Cast second arg to vprintf to PTR. + Use VPRINTF macro if defined. + * config/m88k/xm-delta88.h: Define VPRINTF. Include . + Define TIOC{GETC,GLTC}_BROKEN. + * m88k-nat.c: Uncomment include of . + * main.c: Rename initialize_{main,cmd_lists,history} to init_* to + make things easier on munch (apparently this matters on + the delta88 with svr3). + Thu Jun 17 16:53:56 1993 david d `zoo' zuhn (zoo@cygnus.com) * Makefile.in: canonicalize install.sh; for use within @@ -9,8 +23,6 @@ Tue Jun 15 17:01:23 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) * Makefile.in: remove parentdir support; use INSTALL_XFORM -======= -======= Thu Jun 17 15:08:35 1993 Steve Chamberlain (sac@phydeaux.cygnus.com) * configure.in (alpha-*-osf*), config/alpha/alpha-osf.mh: New @@ -22,7 +34,6 @@ Thu Jun 17 15:08:35 1993 Steve Chamberlain (sac@phydeaux.cygnus.com) * config/sh/tm-sh.h (REGISTER_NAMES): Know about the news ones the simulator defines. ->>>>>>> 1.1384 Wed Jun 16 16:08:18 1993 K. Richard Pixley (rich@sendai.cygnus.com) * NEWS: tracking user visible changes starting with @@ -41,7 +52,6 @@ Wed Jun 16 12:21:49 1993 Fred Fish (fnf@cygnus.com) * alldeps.mak, depend: Update to latest automatically built versions. ->>>>>>> 1.1383 Tue Jun 15 12:26:05 1993 K. Richard Pixley (rich@sendai.cygnus.com) * remote-vx.c: include gdbcmd.h for setlist. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index a423a1b84a..3bf56afbf8 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -128,7 +128,8 @@ RL_LIB = ./../readline${subdir}/libreadline.a # -I. for config files. # -I${srcdir} possibly for regex.h also. # -I${srcdir}/config for more generic config files. -INCLUDE_CFLAGS = -I. -I${srcdir} -I${srcdir}/config -I$(INCLUDE_DIR) +INCLUDE_CFLAGS = -I. -I${srcdir} -I${srcdir}/config \ + -I$(INCLUDE_DIR) -I../include # M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS # from the config/ directory. diff --git a/gdb/m88k-nat.c b/gdb/m88k-nat.c index bbbceb8c2e..189c18df68 100644 --- a/gdb/m88k-nat.c +++ b/gdb/m88k-nat.c @@ -44,7 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "value.h" #ifdef DELTA88 -/* #include */ +#include /* define offsets to the pc instruction offsets in ptrace_user struct */ #define SXIP_OFFSET ((char *)&u.pt_sigframe.sig_sxip - (char *)&u) diff --git a/gdb/main.c b/gdb/main.c index d842197935..5e00b8639a 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -78,13 +78,13 @@ static void quit_command PARAMS ((char *, int)); static void -initialize_main PARAMS ((void)); +init_main PARAMS ((void)); static void -initialize_history PARAMS ((void)); +init_history PARAMS ((void)); static void -initialize_cmd_lists PARAMS ((void)); +init_cmd_lists PARAMS ((void)); static void float_handler PARAMS ((int)); @@ -729,9 +729,9 @@ GDB manual (available as on-line info or a printed manual).\n", stderr); /* Run the init function of each source file */ - initialize_cmd_lists (); /* This needs to be done first */ + init_cmd_lists (); /* This needs to be done first */ initialize_all_files (); - initialize_main (); /* But that omits this file! Do it now */ + init_main (); /* But that omits this file! Do it now */ init_signals (); if (!quiet) @@ -882,7 +882,7 @@ GDB manual (available as on-line info or a printed manual).\n", stderr); free ((PTR)cmdarg); /* Read in the old history after all the command files have been read. */ - initialize_history(); + init_history(); if (batch) { @@ -2369,7 +2369,7 @@ batch_mode () static void -initialize_cmd_lists () +init_cmd_lists () { cmdlist = NULL; infolist = NULL; @@ -2401,7 +2401,7 @@ initialize_cmd_lists () */ static void -initialize_history() +init_history() { char *tmpenv; @@ -2426,7 +2426,7 @@ initialize_history() } static void -initialize_main () +init_main () { struct cmd_list_element *c; diff --git a/gdb/printcmd.c b/gdb/printcmd.c index d40a2f8138..54b5d942bc 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -1815,6 +1815,7 @@ printf_command (arg, from_tty) /* There is not a standard way to make a va_list, so we need to do various things for different systems. */ #if defined (__INT_VARARGS_H) + /* This is defined by an 88k using gcc1. Do other machines use it? */ { va_list list; @@ -1824,7 +1825,11 @@ printf_command (arg, from_tty) vprintf (string, list); } #else /* No __INT_VARARGS_H. */ - vprintf (string, arg_bytes); +#ifdef VPRINTF + VPRINTF (string, arg_bytes); +#else /* No VPRINTF. */ + vprintf (string, (PTR) arg_bytes); +#endif /* No VPRINTF. */ #endif /* No __INT_VARARGS_H. */ }