From 5f8a3188304fc1456111158ae5e51889b3142801 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 30 Jul 2002 13:45:15 +0000 Subject: [PATCH] 2002-07-30 Andrew Cagney * symtab.h: Replace #include "gdb_obstack.h" with opaque declaration. * cli/cli-cmds.c, cli/cli-script.c: Include "gdb_string.h". * gnu-v3-abi.c, arc-tdep.c, cli/cli-decode.c: Ditto. * avr-tdep.c, mon960-rom.c, i960-tdep.c: Ditto. * arch-utils.c, cli/cli-setshow.c: Unconditionally include "gdb_string.h". * Makefile.in (cli-script.o, cli-cmds.o): Update dependencies. (gnu-v3-abi.o, cli-setshow.o, i960-tdep.o): Ditto. (cli-decode.o, mi-cmd-var.o, mi-cmd-disas.o): Ditto. (avr-tdep.o, mon960-rom.o): Ditto. (aout_stabs_gnu_h): Define. (symtab_h): Remove $(gdb_obstack_h). --- gdb/ChangeLog | 16 ++++++++++++++ gdb/Makefile.in | 51 +++++++++++++++++++++++-------------------- gdb/arc-tdep.c | 1 + gdb/arch-utils.c | 2 +- gdb/avr-tdep.c | 1 + gdb/cli/cli-cmds.c | 1 + gdb/cli/cli-decode.c | 1 + gdb/cli/cli-script.c | 1 + gdb/cli/cli-setshow.c | 2 -- gdb/gnu-v3-abi.c | 1 + gdb/i960-tdep.c | 1 + gdb/mi/ChangeLog | 6 +++++ gdb/mi/mi-cmd-disas.c | 1 + gdb/mi/mi-cmd-var.c | 1 + gdb/mon960-rom.c | 1 + gdb/symtab.h | 5 ++--- 16 files changed, 62 insertions(+), 30 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6d94a24dc60..d57c4af93cd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,19 @@ +2002-07-30 Andrew Cagney + + * symtab.h: Replace #include "gdb_obstack.h" with opaque + declaration. + * cli/cli-cmds.c, cli/cli-script.c: Include "gdb_string.h". + * gnu-v3-abi.c, arc-tdep.c, cli/cli-decode.c: Ditto. + * avr-tdep.c, mon960-rom.c, i960-tdep.c: Ditto. + * arch-utils.c, cli/cli-setshow.c: Unconditionally include + "gdb_string.h". + * Makefile.in (cli-script.o, cli-cmds.o): Update dependencies. + (gnu-v3-abi.o, cli-setshow.o, i960-tdep.o): Ditto. + (cli-decode.o, mi-cmd-var.o, mi-cmd-disas.o): Ditto. + (avr-tdep.o, mon960-rom.o): Ditto. + (aout_stabs_gnu_h): Define. + (symtab_h): Remove $(gdb_obstack_h). + 2002-07-30 Jim Blandy Patch from David Carlton : diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c4ce7089618..1c708523820 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -568,6 +568,7 @@ LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c # non-binary-compatible way, it is a real pain to remake the right stuff # without these dependencies -kingdon, 13 Mar 1994) aout_aout64_h = $(INCLUDE_DIR)/aout/aout64.h +aout_stabs_gnu_h = $(INCLUDE_DIR)/aout/stabs_gnu.h getopt_h = $(INCLUDE_DIR)/getopt.h floatformat_h = $(INCLUDE_DIR)/floatformat.h bfd_h = $(BFD_DIR)/bfd.h @@ -669,7 +670,7 @@ solist_h = solist.h source_h = source.h stabsread_h = stabsread.h symfile_h = symfile.h -symtab_h = symtab.h $(gdb_obstack_h) +symtab_h = symtab.h target_h = target.h $(bfd_h) $(symtab_h) $(dcache_h) $(memattr_h) terminal_h = terminal.h top_h = top.h @@ -1316,7 +1317,7 @@ armnbsd-tdep.o: armnbsd-tdep.c $(defs_h) $(arm_tdep_h) solib-svr4.h \ nbsd-tdep.h avr-tdep.o: avr-tdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) $(inferior_h) \ - $(symfile_h) $(regcache_h) $(arch_utils_h) + $(symfile_h) $(arch_utils_h) $(regcache_h) $(gdb_string_h) bcache.o: bcache.c $(defs_h) $(gdb_obstack_h) $(bcache_h) $(gdb_string_h) @@ -1625,7 +1626,8 @@ gnu-nat.o: process_reply_S.h exc_request_S.h notify_S.h msg_reply_S.h \ gnu-v2-abi.o: gnu-v2-abi.c $(defs_h) $(gdb_string_h) $(symtab_h) \ $(gdbtypes_h) $(value_h) $(demangle_h) $(cp_abi_h) -gnu-v3-abi.o: gnu-v2-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(demangle_h) +gnu-v3-abi.o: gnu-v3-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(demangle_h) \ + $(gdb_assert_h) $(gdb_string_h) h8300-tdep.o: h8300-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(dis_asm_h) \ $(gdbcmd_h) $(gdbtypes_h) $(gdbcore_h) $(gdb_string_h) $(value_h) \ @@ -1696,9 +1698,8 @@ i386v4-nat.o: i386v4-nat.c $(defs_h) $(regcache_h) i387-tdep.o: i387-tdep.c $(floatformat_h) $(defs_h) $(gdbcore_h) \ $(inferior_h) $(language_h) $(regcache_h) $(doublest_h) i386-tdep.h -i960-tdep.o: i960-tdep.c $(floatformat_h) $(defs_h) $(expression_h) \ - $(frame_h) $(gdbtypes_h) $(symtab_h) $(value_h) $(gdbcore_h) \ - $(regcache_h) +i960-tdep.o: i960-tdep.c $(defs_h) $(symtab_h) $(value_h) $(frame_h) \ + $(floatformat_h) $(target_h) $(gdbcore_h) $(inferior_h) $(regcache_h) ia64-linux-nat.o: ia64-linux-nat.c $(defs_h) $(inferior_h) $(target_h) \ $(gdbcore_h) $(regcache_h) @@ -2129,8 +2130,9 @@ sh3-rom.o: sh3-rom.c $(monitor_h) $(bfd_h) $(gdb_wait_h) $(defs_h) $(gdbcmd_h) \ signals.o: signals/signals.c $(defs_h) $(target_h) $(CC) -c $(INTERNAL_CFLAGS) $< -mon960-rom.o: mon960-rom.c $(monitor_h) $(bfd_h) $(gdb_wait_h) $(defs_h) \ - $(gdbcmd_h) $(inferior_h) $(target_h) $(serial_h) $(terminal_h) +mon960-rom.o: mon960-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \ + $(serial_h) $(srec_h) $(xmodem_h) $(symtab_h) $(symfile_h) \ + $(inferior_h) solib.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \ $(objfiles_h) $(gdb_regex_h) $(symfile_h) $(target_h) $(gdb_string_h) \ @@ -2358,28 +2360,29 @@ wrapper.o: wrapper.c $(defs_h) $(frame_h) $(value_h) $(wrapper_h) # Need to explicitly specify the compile rule as make will do nothing # or try to compile the object file into the cli directory. -cli-cmds.o: $(srcdir)/cli/cli-cmds.c $(cli_cmds_h) $(cli_decode_h) \ - $(cli_script_h) $(cli_setshow_h) $(top_h) $(completer_h) \ - $(defs_h) $(target_h) $(gdb_wait_h) $(gdb_regex_h) $(ui_out_h) +cli-cmds.o: $(srcdir)/cli/cli-cmds.c $(defs_h) $(completer_h) $(target_h) \ + $(gdb_wait_h) $(gdb_regex_h) $(gdb_string_h) $(filenames_h) \ + $(ui_out_h) $(top_h) $(cli_cli_decode_h) $(cli_cli_script_h) \ + $(cli_cli_setshow_h) $(cli_cli_cmds_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-cmds.c -cli-decode.o: $(srcdir)/cli/cli-decode.c $(cli_decode_h) \ - $(cli_cmds_h) $(defs_h) $(ui_out_h) \ - $(symtab_h) $(gdb_regex_h) +cli-decode.o: $(srcdir)/cli/cli-decode.c $(defs_h) $(symtab_h) $(gdb_regex_h) \ + $(gdb_string_h) $(ui_out_h) $(cli_cli_cmds_h) \ + $(cli_cli_decode_h) $(gdb_assert_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-decode.c cli-dump.o: $(srcdir)/cli/cli-dump.c $(defs_h) $(gdb_string_h) $(command_h) \ $(value_h) $(gdbcmd_h) $(completer_h) $(cli_dump_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-dump.c -cli-setshow.o: $(srcdir)/cli/cli-setshow.c $(cli_setshow_h) \ - $(cli_decode_h) $(cli_cmds_h) $(defs_h) \ - $(value_h) $(ui_out_h) +cli-setshow.o: $(srcdir)/cli/cli-setshow.c $(defs_h) $(value_h) \ + $(gdb_string_h) $(ui_out_h) $(cli_cli_decode_h) \ + $(cli_cli_cmds_h) $(cli_cli_setshow_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-setshow.c -cli-script.o: $(srcdir)/cli/cli-script.c $(cli_script_h) \ - $(cli_cmds_h) $(cli_decode_h) $(top_h) \ - $(defs_h) $(value_h) $(language_h) $(ui_out_h) +cli-script.o: $(srcdir)/cli//cli-script.c $(defs_h) $(value_h) $(language_h) \ + $(ui_out_h) $(top_h) $(cli_cli_cmds_h) $(cli_cli_decode_h) \ + $(cli_cli_script_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/cli/cli-script.c cli-utils.o: $(srcdir)/cli/cli-utils.c $(cli_utils_h) $(defs_h) @@ -2399,8 +2402,8 @@ mi_console_h = $(srcdir)/mi/mi-console.h mi-cmds.o: $(srcdir)/mi/mi-cmds.c $(defs_h) $(top_h) $(mi_cmds_h) $(ui_out_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmds.c -mi-cmd-var.o: $(srcdir)/mi/mi-cmd-var.c $(defs_h) $(top_h) $(mi_cmds_h) \ - $(ui_out_h) $(varobj_h) +mi-cmd-var.o: $(srcdir)/mi/mi-cmd-var.c $(defs_h) $(mi_cmds_h) $(ui_out_h) \ + $(mi_out_h) $(varobj_h) $(value_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-var.c mi-cmd-stack.o: $(srcdir)/mi/mi-cmd-stack.c $(defs_h) $(top_h) $(mi_cmds_h) \ $(ui_out_h) $(frame_h) $(value_h) $(target_h) @@ -2409,8 +2412,8 @@ mi-cmd-break.o: $(srcdir)/mi/mi-cmd-break.c $(defs_h) $(mi_cmds_h) \ $(ui_out_h) $(mi_out_h) $(breakpoint_h) $(gdb_string_h) \ $(gdb_events_h) $(mi_getopt_h) $(gdb_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-break.c -mi-cmd-disas.o: $(srcdir)/mi/mi-cmd-disas.c $(defs_h) $(mi_cmds_h) \ - $(ui_out_h) $(value_h) $(target_h) +mi-cmd-disas.o: $(srcdir)/mi/mi-cmd-disas.c $(defs_h) $(target_h) $(value_h) \ + $(mi_cmds_h) $(mi_getopt_h) $(ui_out_h) $(gdb_string_h) $(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-disas.c mi-main.o: $(srcdir)/mi/mi-main.c $(defs_h) $(top_h) $(mi_cmds_h) $(ui_out_h) \ $(mi_console_h) $(mi_getopt_h) $(event_loop_h) $(event_top_h) \ diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c index cab7721a440..0614ebe0d22 100644 --- a/gdb/arc-tdep.c +++ b/gdb/arc-tdep.c @@ -27,6 +27,7 @@ #include "symtab.h" #include "gdbcmd.h" #include "regcache.h" +#include "gdb_string.h" /* Local functions */ diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index b79a02a76ab..a407f9e28be 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -29,7 +29,6 @@ #else /* Just include everything in sight so that the every old definition of macro is visible. */ -#include "gdb_string.h" #include "symtab.h" #include "frame.h" #include "inferior.h" @@ -40,6 +39,7 @@ #include "target.h" #include "annotate.h" #endif +#include "gdb_string.h" #include "regcache.h" #include "gdb_assert.h" #include "sim-regno.h" diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index 79f8d6b3a06..21b179c1c5a 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -31,6 +31,7 @@ #include "symfile.h" #include "arch-utils.h" #include "regcache.h" +#include "gdb_string.h" /* AVR Background: diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index bcd9a42e1b5..799e1f464d6 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -24,6 +24,7 @@ #include "target.h" /* For baud_rate, remote_debug and remote_timeout */ #include "gdb_wait.h" /* For shell escape implementation */ #include "gdb_regex.h" /* Used by apropos_command */ +#include "gdb_string.h" #include "filenames.h" /* for DOSish file names */ #include "ui-out.h" diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index 84e445ee980..bce0c2d3f41 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -22,6 +22,7 @@ #include "symtab.h" #include #include "gdb_regex.h" +#include "gdb_string.h" #include "ui-out.h" diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c index fc3261c7ade..9aac6e6aaae 100644 --- a/gdb/cli/cli-script.c +++ b/gdb/cli/cli-script.c @@ -27,6 +27,7 @@ #include #include "ui-out.h" +#include "gdb_string.h" #include "top.h" #include "cli/cli-cmds.h" diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c index 94ba94e16dd..44b0b4ec460 100644 --- a/gdb/cli/cli-setshow.c +++ b/gdb/cli/cli-setshow.c @@ -20,9 +20,7 @@ #include "defs.h" #include "value.h" #include -#if 0 #include "gdb_string.h" -#endif #include "ui-out.h" diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c index 4df4dc6ee1c..fbab8af0a18 100644 --- a/gdb/gnu-v3-abi.c +++ b/gdb/gnu-v3-abi.c @@ -25,6 +25,7 @@ #include "cp-abi.h" #include "demangle.h" #include "gdb_assert.h" +#include "gdb_string.h" static struct cp_abi_ops gnu_v3_abi_ops; diff --git a/gdb/i960-tdep.c b/gdb/i960-tdep.c index 98718a387a0..2b16adfc40f 100644 --- a/gdb/i960-tdep.c +++ b/gdb/i960-tdep.c @@ -32,6 +32,7 @@ #include "gdbcore.h" #include "inferior.h" #include "regcache.h" +#include "gdb_string.h" static CORE_ADDR next_insn (CORE_ADDR memaddr, unsigned int *pword1, unsigned int *pword2); diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog index 1d1ea814a4c..e5a162fa25f 100644 --- a/gdb/mi/ChangeLog +++ b/gdb/mi/ChangeLog @@ -1,3 +1,9 @@ +2002-07-29 Andrew Cagney + + + * mi-cmd-var.c: Include "gdb_string.h". + * mi-cmd-disas.c: Ditto. + 2002-06-17 Keith Seitz * gdbmi.texinfo: Update command examples with real MI behavior. diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c index 70054c635c8..028dc0758f3 100644 --- a/gdb/mi/mi-cmd-disas.c +++ b/gdb/mi/mi-cmd-disas.c @@ -25,6 +25,7 @@ #include "mi-cmds.h" #include "mi-getopt.h" #include "ui-out.h" +#include "gdb_string.h" /* Disassemble functions. FIXME: these do not really belong here. We should get rid of all the duplicate code in gdb that does the same diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index 4848a4e29c1..cb5e939e9f1 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -28,6 +28,7 @@ #include "varobj.h" #include "value.h" #include +#include "gdb_string.h" extern int varobjdebug; /* defined in varobj.c */ diff --git a/gdb/mon960-rom.c b/gdb/mon960-rom.c index 2b7fe5fd58d..46f5784ed7c 100644 --- a/gdb/mon960-rom.c +++ b/gdb/mon960-rom.c @@ -30,6 +30,7 @@ #include "symtab.h" #include "symfile.h" /* for generic_load */ #include "inferior.h" /* for write_pc() */ +#include "gdb_string.h" #define USE_GENERIC_LOAD diff --git a/gdb/symtab.h b/gdb/symtab.h index c6da736b473..ebb18614567 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -23,9 +23,8 @@ #if !defined (SYMTAB_H) #define SYMTAB_H 1 -/* Some definitions and declarations to go with use of obstacks. */ - -#include "gdb_obstack.h" +/* Opaque declarations. */ +struct obstack; /* Don't do this; it means that if some .o's are compiled with GNU C and some are not (easy to do accidentally the way we configure -- 2.30.2