From 8b14323b280064c640c68c03ae566c10660b4b25 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Wed, 3 Jun 1998 20:02:02 +0000 Subject: [PATCH] Merge changes from EMC branch: ax-gdb.c, ax-general.c --- gdb/Makefile.in | 95 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 73 insertions(+), 22 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index ef43888776b..1b9a8fd381d 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -279,7 +279,7 @@ SER_HARDWIRE = ser-unix.o # The `remote' debugging target is supported for most architectures, # but not all (e.g. 960) -REMOTE_OBS = remote.o dcache.o remote-utils.o tracepoint.o +REMOTE_OBS = remote.o dcache.o remote-utils.o tracepoint.o ax-general.o ax-gdb.o # This is remote-sim.o if a simulator is to be linked in. SIM_OBS = @@ -396,22 +396,22 @@ TARGET_FLAGS_TO_PASS = \ # Links made at configuration time should not be specified here, since # SFILES is used in building the distribution archive. -SFILES = bcache.c blockframe.c breakpoint.c buildsym.c c-exp.y \ - c-lang.c c-typeprint.c c-valprint.c ch-exp.c ch-lang.c \ - ch-typeprint.c ch-valprint.c coffread.c command.c complaints.c \ - corefile.c cp-valprint.c \ - dbxread.c demangle.c dwarfread.c dwarf2read.c \ - elfread.c environ.c eval.c expprint.c \ - f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \ - gdbtypes.c infcmd.c inflow.c infrun.c language.c \ +SFILES = ax-general.c ax-gdb.c bcache.c blockframe.c breakpoint.c \ + buildsym.c c-exp.y c-lang.c c-typeprint.c c-valprint.c \ + ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c coffread.c \ + command.c complaints.c corefile.c cp-valprint.c dbxread.c \ + demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ + expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ + findvar.c gdbtypes.c infcmd.c inflow.c infrun.c language.c \ + $(start-sanitize-java) \ jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c \ + $(end-sanitize-java) \ m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c main.c maint.c \ mem-break.c minsyms.c mipsread.c nlmread.c objfiles.c parse.c \ - printcmd.c remote.c remote-nrom.c scm-exp.c scm-lang.c scm-valprint.c \ - source.c stabsread.c stack.c symfile.c symmisc.c \ - symtab.c target.c thread.c top.c \ - tracepoint.c typeprint.c utils.c \ - valarith.c valops.c valprint.c values.c \ + printcmd.c remote.c remote-nrom.c scm-exp.c scm-lang.c \ + scm-valprint.c source.c stabsread.c stack.c symfile.c \ + symmisc.c symtab.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 os9kread.c LINTFILES = $(SFILES) $(YYFILES) @CONFIG_SRCS@ init.c @@ -475,7 +475,11 @@ HFILES_NO_SRCDIR = bcache.h buildsym.h call-cmds.h coff-solib.h defs.h \ gdb-stabs.h $(inferior_h) language.h minimon.h monitor.h \ objfiles.h parser-defs.h partial-stab.h serial.h signals.h solib.h \ symfile.h stabsread.h target.h terminal.h typeprint.h xcoffsolib.h \ - c-lang.h ch-lang.h f-lang.h jv-lang.h m2-lang.h \ + c-lang.h ch-lang.h f-lang.h \ + $(start-sanitize-java) \ + jv-lang.h \ + $(end-sanitize-java) \ + m2-lang.h \ complaints.h valprint.h \ 29k-share/udi/udiids.h 29k-share/udi_soc nindy-share/b.out.h \ nindy-share/block_io.h nindy-share/coff.h \ @@ -522,7 +526,10 @@ COMMON_OBS = version.o blockframe.o breakpoint.o findvar.o stack.o thread.o \ dbxread.o coffread.o elfread.o \ dwarfread.o dwarf2read.o mipsread.o stabsread.o corefile.o \ c-lang.o ch-exp.o ch-lang.o f-lang.o \ - jv-lang.o jv-valprint.o jv-typeprint.o m2-lang.o \ + $(start-sanitize-java) \ + jv-lang.o jv-valprint.o jv-typeprint.o \ + $(end-sanitize-java) \ + m2-lang.o \ scm-exp.o scm-lang.o scm-valprint.o complaints.o typeprint.o \ c-typeprint.o ch-typeprint.o f-typeprint.o m2-typeprint.o \ c-valprint.o cp-valprint.o ch-valprint.o f-valprint.o m2-valprint.o \ @@ -546,8 +553,16 @@ SUBDIRS = doc \ nlm # For now, shortcut the "configure GDB for fewer languages" stuff. -YYFILES = c-exp.tab.c jv-exp.tab.c f-exp.tab.c m2-exp.tab.c -YYOBJ = c-exp.tab.o jv-exp.tab.o f-exp.tab.o m2-exp.tab.o +YYFILES = c-exp.tab.c \ + $(start-sanitize-java) \ + jv-exp.tab.c \ + $(end-sanitize-java) \ + f-exp.tab.c m2-exp.tab.c +YYOBJ = c-exp.tab.o \ + $(start-sanitize-java) \ + jv-exp.tab.o \ + $(end-sanitize-java) \ + f-exp.tab.o m2-exp.tab.o # Things which need to be built when making a distribution. @@ -695,10 +710,18 @@ libgdb-files: $(LIBGDBDEPS) Makefile.in saber_gdb: $(SFILES) $(DEPFILES) copying.c version.c #setopt load_flags $(CFLAGS) $(BFD_CFLAGS) -DHOST_SYS=SUN4_SYS #load ./init.c $(SFILES) - #unload $(srcdir)/c-exp.y $(srcdir)/jv-exp.y $(srcdir)/m2-exp.y + #unload $(srcdir)/c-exp.y + $(start-sanitize-java) + #unload $(srcdir)/jv-exp.y + $(end-sanitize-java) + #unload $(srcdir)/m2-exp.y #unload vx-share/*.h #unload nindy-share/[A-Z]* - #load c-exp.tab.c jv-exp.tab.c m2-exp.tab.c + #load c-exp.tab.c + $(start-sanitize-java) + #load jv-exp.tab.c + $(end-sanitize-java) + #load m2-exp.tab.c #load copying.c version.c #load ../opcodes/libopcodes.a #load ../libiberty/libiberty.a @@ -789,7 +812,11 @@ realclean: maintainer-clean local-maintainer-clean: @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f c-exp.tab.c jv-exp.tab.c f-exp.tab.c m2-exp.tab.c + rm -f c-exp.tab.c \ + $(start-sanitize-java) + jv-exp.tab \ + $(end-sanitize-java) + f-exp.tab.c m2-exp.tab.c rm -f TAGS $(INFOFILES) rm -f $(YYFILES) rm -f nm.h tm.h xm.h config.status @@ -871,6 +898,7 @@ c-exp.tab.c: c-exp.y -rm c-exp.tmp mv c-exp.new ./c-exp.tab.c +# start-sanitize-java jv-exp.tab.o: jv-exp.tab.c jv-exp.tab.c: jv-exp.y $(BISON) $(YFLAGS) -o jv-exp.tmp $(srcdir)/jv-exp.y @@ -885,6 +913,7 @@ jv-exp.tab.c: jv-exp.y -rm jv-exp.tmp mv jv-exp.new ./jv-exp.tab.c +# end-sanitize-java f-exp.tab.o: f-exp.tab.c f-exp.tab.c: f-exp.y c-exp.tab.c $(BISON) $(YFLAGS) -o f-exp.tmp $(srcdir)/f-exp.y @@ -918,7 +947,10 @@ m2-exp.tab.c: m2-exp.y mv m2-exp.new ./m2-exp.tab.c # These files are updated atomically, so make never has to remove them -.PRECIOUS: m2-exp.tab.c jv-exp.tab.c f-exp.tab.c c-exp.tab.c +.PRECIOUS: m2-exp.tab.c f-exp.tab.c c-exp.tab.c +# start-sanitize-java +.PRECIOUS: jv-exp.tab.c +# end-sanitize-java lint: $(LINTFILES) $(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \ @@ -1232,6 +1264,19 @@ irix5-nat.o: irix5-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) target.h \ language.h gdb_string.h isi-xdep.o: isi-xdep.c +# start-sanitize-java + +jv-lang.o: jv-lang.c $(bfd_h) $(defs_h) $(symtab_h) $(gdbtypes_h) \ + $(expression_h) parser-defs.h language.h symfile.h objfiles.h \ + gdb_string.h $(value_h) c-lang.h jv-lang.h $(gdbcore_h) + +jv-typeprint.o: jv-typeprint.c $(bfd_h) $(defs_h) $(symtab_h) $(gdbtypes_h) \ + $(value_h) $(INCLUDE_DIR)/demangle.h jv-lang.h gdb_string.h + +jv-valprint.o: jv-valprint.c $(bfd_h) $(defs_h) $(symtab_h) $(gdbtypes_h) \ + $(expression_h) $(value_h) $(INCLUDE_DIR)/demangle.h valprint.h \ + language.h jv-lang.h c-lang.h +# end-sanitize-java language.o: language.c $(bfd_h) $(defs_h) $(expression_h) $(frame_h) \ $(gdbcmd_h) $(gdbtypes_h) language.h parser-defs.h $(symtab_h) \ @@ -1524,6 +1569,10 @@ stabsread.o: stabsread.c $(bfd_h) $(INCLUDE_DIR)/aout/stab.def \ stack.o: stack.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) $(inferior_h) \ language.h target.h gdb_string.h +ax-general.o: ax-general.c $(ax_h) +ax-gdb.o: ax-gdb.c $(defs_h) $(symtab_h) symfile.h $(gdbtypes_h) \ + $(value_h) $(expression_h) $(command_h) $(ax_h) $(gdbcmd_h) ax-gdb.h + sun3-nat.o: sun3-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) sun386-nat.o: sun386-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) @@ -1625,10 +1674,12 @@ c-exp.tab.o: c-exp.tab.c c-lang.h $(defs_h) $(expression_h) \ $(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h) \ $(bfd_h) objfiles.h symfile.h +# start-sanitize-java jv-exp.tab.o: jv-exp.tab.c jv-lang.h $(defs_h) $(expression_h) \ $(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h) \ $(bfd_h) objfiles.h symfile.h +# end-sanitize-java f-exp.tab.o: f-exp.tab.c f-lang.h $(defs_h) $(expression_h) \ language.h parser-defs.h $(value_h) $(bfd_h) objfiles.h symfile.h -- 2.30.2