Merge with mainline; merge tag carlton_dictionary-20021011-merge.

1 files changed, 36 insertions, 32 deletions

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 30b931f..ed35995 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -530,30 +530,31 @@ TARGET_FLAGS_TO_PASS = \
 # SFILES is used in building the distribution archive.
 
 SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
-	ax-general.c ax-gdb.c bcache.c blockframe.c breakpoint.c \
-	charset.c \
-	buildsym.c c-exp.y c-lang.c c-typeprint.c c-valprint.c \
-	coffread.c \
-	complaints.c completer.c corefile.c cp-valprint.c dbxread.c \
-	demangle.c dictionary.c dwarfread.c \
-	dwarf2read.c elfread.c environ.c eval.c \
-	event-loop.c event-top.c \
-	expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \
-	findvar.c regcache.c gdbarch.c arch-utils.c gdbtypes.c osabi.c \
-	inf-loop.c infcmd.c inflow.c infrun.c language.c \
-	kod.c kod-cisco.c \
-	ui-out.c cli-out.c \
-	varobj.c wrapper.c \
+	ax-general.c ax-gdb.c \
+	bcache.c blockframe.c breakpoint.c buildsym.c builtin-regs.c \
+	c-exp.y c-lang.c c-typeprint.c c-valprint.c \
+	charset.c cli-out.c coffread.c complaints.c completer.c corefile.c \
+	cp-abi.c cp-support.c cp-valprint.c \
+	dbxread.c demangle.c dictionary.c \
+	disasm.c doublest.c dwarfread.c dwarf2read.c \
+	elfread.c environ.c eval.c event-loop.c event-top.c expprint.c \
+	f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c frame.c \
+	gdbarch.c arch-utils.c gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c \
+	hpacc-abi.c \
+	inf-loop.c infcmd.c inflow.c infrun.c \
 	jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c \
-	m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c main.c maint.c \
-	memattr.c mem-break.c minsyms.c mipsread.c nlmread.c objfiles.c \
-	p-exp.y p-lang.c p-typeprint.c p-valprint.c parse.c \
-	macrotab.c macroexp.c macrocmd.c macroscope.c \
-	printcmd.c remote.c scm-exp.c scm-lang.c \
-	scm-valprint.c source.c stabsread.c stack.c symfile.c \
-	symmisc.c symtab.c linespec.c target.c thread.c top.c tracepoint.c \
-	typeprint.c utils.c valarith.c valops.c valprint.c values.c \
-	serial.c ser-unix.c mdebugread.c \
+	kod.c kod-cisco.c \
+	language.c linespec.c \
+	m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c \
+	macrotab.c macroexp.c macrocmd.c macroscope.c main.c maint.c \
+	mdebugread.c memattr.c mem-break.c minsyms.c mipsread.c \
+	nlmread.c \
+	objfiles.c osabi.c \
+	p-exp.y p-lang.c p-typeprint.c p-valprint.c parse.c printcmd.c \
+	regcache.c remote.c \
+	scm-exp.c scm-lang.c scm-valprint.c serial.c ser-unix.c source.c \
+	stabsread.c stack.c std-regs.c symfile.c symmisc.c symtab.c \
+	target.c thread.c top.c tracepoint.c typeprint.c \
 	tui/tui.c tui/tui.h tui/tuiCommand.c tui/tuiCommand.h \
 	tui/tuiData.c tui/tuiData.h tui/tuiDataWin.c tui/tuiDataWin.h \
 	tui/tuiDisassem.c tui/tuiDisassem.h tui/tuiGeneralWin.c \
@@ -562,10 +563,9 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
 	tui/tuiSource.h tui/tuiSourceWin.c tui/tuiSourceWin.h \
 	tui/tuiStack.c tui/tuiStack.h tui/tuiWin.c tui/tuiWin.h \
 	tui/tui-file.h tui/tui-file.c tui/tui-out.c tui/tui-hooks.c \
-	ui-file.h ui-file.c \
-	frame.c doublest.c \
-	builtin-regs.c std-regs.c \
-	gnu-v2-abi.c gnu-v3-abi.c hpacc-abi.c cp-abi.c cp-support.c
+	ui-out.c utils.c ui-file.h ui-file.c \
+	valarith.c valops.c valprint.c values.c varobj.c \
+	wrapper.c
 
 LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
 
@@ -639,6 +639,7 @@ defs_h = defs.h $(config_h) $(gdb_locale_h) $(gdb_signals_h) $(ansidecl_h) \
 	$(libiberty_h) $(progress_h) $(bfd_h) $(tui_h) $(ui_file_h) $(xm_h) \
 	$(nm_h) $(tm_h) $(fopen_same_h) $(gdbarch_h) $(arch_utils_h)
 dictionary_h = dictionary.h
+disasm_h = disasm.h
 doublest_h = doublest.h $(floatformat_h)
 dst_h = dst.h
 dwarf2cfi_h = dwarf2cfi.h
@@ -829,7 +830,8 @@ TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
 TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
 
 COMMON_OBS = version.o blockframe.o breakpoint.o findvar.o regcache.o \
-	charset.o dictionary.o \
+	charset.o dictionary.o disasm.o \
+	charset.o disasm.o \
 	source.o values.o eval.o valops.o valarith.o valprint.o printcmd.o \
 	symtab.o symfile.o symmisc.o linespec.o infcmd.o infrun.o \
 	expprint.o environ.o stack.o thread.o \
@@ -1622,6 +1624,8 @@ dictionary.o: dictionary.c $(defs_h) $(dictionary_h) $(gdb_obstack_h) \
 	$(symtab_h) $(buildsym_h) $(gdb_assert_h)
 dink32-rom.o: dink32-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \
 	$(serial_h) $(symfile_h) $(inferior_h) $(regcache_h)
+disasm.o: disasm.c $(defs_h) $(gdb_string_h) $(target_h) $(value_h) \
+	$(disasm_h) $(ui_out_h)
 doublest.o: doublest.c $(defs_h) $(doublest_h) $(floatformat_h) \
 	$(gdb_assert_h) $(gdb_string_h) $(gdbtypes_h)
 dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h) $(gdb_string_h)
@@ -2345,7 +2349,7 @@ install-gdbtk:
 	else \
 	  true ; \
 	fi ; \
-	$(SHELL) $(srcdir)/../mkinstalldirs $(bindir)
+	$(SHELL) $(srcdir)/../mkinstalldirs $(bindir); \
 	$(INSTALL_PROGRAM) insight$(EXEEXT) $(bindir)/$$transformed_name$(EXEEXT) ; \
 	$(SHELL) $(srcdir)/../mkinstalldirs $(GDBTK_LIBRARY) ; \
 	$(SHELL) $(srcdir)/../mkinstalldirs $(libdir)/insight$(GDBTK_VERSION) ; \
@@ -2381,7 +2385,7 @@ insight$(EXEEXT): gdbtk-main.o main.o libgdb.a $(CONFIG_OBS) $(ADD_DEPS) \
 		$(CDEPS) $(TDEPLIBS)
 	rm -f insight$(EXEEXT)
 	$(HLDENV) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \
-		-o insight$(EXEEXT) gdbtk-main.o main.o libgdb.a $(CONFIG_OBS)\
+		-o insight$(EXEEXT) gdbtk-main.o main.o $(CONFIG_OBS) libgdb.a \
 		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
 
 gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico
@@ -2476,7 +2480,7 @@ mi-cmd-break.o: $(srcdir)/mi/mi-cmd-break.c $(defs_h) $(mi_cmds_h) \
 	$(mi_getopt_h) $(gdb_events_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) $(target_h) $(value_h) \
-	$(mi_cmds_h) $(mi_getopt_h) $(ui_out_h) $(gdb_string_h)
+	$(mi_cmds_h) $(mi_getopt_h) $(ui_out_h) $(gdb_string_h) $(disasm_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-cmd-disas.c
 mi-cmd-stack.o: $(srcdir)/mi/mi-cmd-stack.c $(defs_h) $(target_h) $(frame_h) \
 	$(value_h) $(mi_cmds_h) $(ui_out_h) $(symtab_h) $(dictionary_h)
@@ -2497,7 +2501,7 @@ mi-main.o: $(srcdir)/mi/mi-main.c $(defs_h) $(target_h) $(inferior_h) \
 	$(gdb_string_h) $(top_h) $(gdbthread_h) $(mi_cmds_h) $(mi_parse_h) \
 	$(mi_getopt_h) $(mi_console_h) $(ui_out_h) $(mi_out_h) \
 	$(event_loop_h) $(event_top_h) $(gdbcore_h) $(value_h) $(regcache_h) \
-	$(gdb_h)
+	$(gdb_h) $(frame_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-main.c
 mi-out.o: $(srcdir)/mi/mi-out.c $(defs_h) $(ui_out_h) $(mi_out_h)
 	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/mi/mi-out.c