Re: [PATCH] Basic Ada files

Aidan Skinner
2002-05-22T16:21:47Z

[-- Attachment #1: Type: text/plain, Size: 620 bytes --]

Andrew Cagney <ac131313@cygnus.com> wrote:

> Can I suggest posting (actually tabling) a patch to just change
> gdb/Makefile.in (as a side effect it means that you meet the criteria
> for write after approval - have assignment, submitted one good patch :-).

OK. The makefile.in patch is attached to this email.

- Aidan

--
aidan@velvet.net http://www.velvet.net/~aidan/ aim:aidans42
finger for pgp key fingerprint |Unix Programmer/Admin actively seeking work
01AA 1594 2DB0 09E3 B850 |CV at http://www.velvet.net/~aidan/cv.txt
C2D0 9A2C 4CC9 3EC4 75E1 |Gis a job, go on, I can do that, go on, gis it.

[-- Attachment #2: ada_makefile.in.patch --]
[-- Type: text/plain, Size: 6187 bytes --]

diff -Nwupr gdb+dejagnu-20020516.ada-clean/gdb/Makefile.in gdb+dejagnu-20020516/gdb/Makefile.in
--- gdb+dejagnu-20020516.ada-clean/gdb/Makefile.in Sat May 18 09:45:11 2002
+++ gdb+dejagnu-20020516/gdb/Makefile.in Wed May 15 22:19:16 2002
@@ -79,11 +79,6 @@ VPATH = @srcdir@

YACC=@YACC@

-# This is used to rebuild ada-lex.c from ada-lex.l. If the program is
-# not defined, but ada-lex.c is present, compilation will continue,
-# possibly with a warning.
-FLEX = flex
-
YLWRAP = $(srcdir)/../ylwrap

# where to find makeinfo, preferably one designed for texinfo-2
@@ -528,8 +523,7 @@ TARGET_FLAGS_TO_PASS = \
# Links made at configuration time should not be specified here, since
# 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 \
+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 \
complaints.c completer.c corefile.c cp-valprint.c dbxread.c \
@@ -684,7 +678,7 @@ HFILES_NO_SRCDIR = bcache.h buildsym.h c
objfiles.h parser-defs.h serial.h solib.h \
symfile.h stabsread.h target.h terminal.h typeprint.h xcoffsolib.h \
macrotab.h macroexp.h \
- ada-lang.h c-lang.h ch-lang.h f-lang.h \
+ c-lang.h ch-lang.h f-lang.h \
jv-lang.h \
m2-lang.h p-lang.h \
complaints.h valprint.h \
@@ -737,7 +731,6 @@ COMMON_OBS = version.o blockframe.o brea
exec.o bcache.o objfiles.o minsyms.o maint.o demangle.o \
dbxread.o coffread.o elfread.o \
dwarfread.o dwarf2read.o mipsread.o stabsread.o corefile.o \
- ada-lang.o ada-typeprint.o ada-valprint.o ada-tasks.o \
c-lang.o ch-exp.o ch-lang.o f-lang.o \
ui-out.o cli-out.o \
varobj.o wrapper.o \
@@ -759,11 +752,9 @@ SUBDIRS = @SUBDIRS@

# For now, shortcut the "configure GDB for fewer languages" stuff.
YYFILES = c-exp.tab.c \
- ada-exp.tab.c \
jv-exp.tab.c \
f-exp.tab.c m2-exp.tab.c p-exp.tab.c
YYOBJ = c-exp.tab.o \
- ada-exp.tab.o \
jv-exp.tab.o \
f-exp.tab.o m2-exp.tab.o p-exp.tab.o

@@ -1012,7 +1003,6 @@ 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 \
- ada-lex.c ada-exp.tab.c \
jv-exp.tab \
f-exp.tab.c m2-exp.tab.c p-exp.tab.c
rm -f TAGS $(INFOFILES)
@@ -1148,33 +1138,6 @@ m2-exp.tab.c: m2-exp.y
-rm m2-exp.tmp
mv m2-exp.new ./m2-exp.tab.c

-# ada-exp.tab.c is generated in objdir from ada-exp.y if it doesn't exist
-# in srcdir, then compiled in objdir to ada-exp.tab.o.
-# Remove bogus decls for malloc/realloc/free which conflict with everything
-# else.
-ada-exp.tab.c: ada-exp.y
- $(YACC) $(YFLAGS) $(srcdir)/ada-exp.y
- -sed -e '/extern.*malloc/d' \
- -e '/extern.*realloc/d' \
- -e '/extern.*free/d' \
- -e '/include.*malloc.h/d' \
- -e 's/malloc/xmalloc/g' \
- -e 's/realloc/xrealloc/g' \
- < y.tab.c > ada-exp.new
- -rm y.tab.c
- mv ada-exp.new ./ada-exp.tab.c
-
-ada-lex.c: ada-lex.l
- @if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \
- echo $(FLEX) -Isit $(srcdir)/ada-lex.l ">" ada-lex.c; \
- $(FLEX) -Isit $(srcdir)/ada-lex.l > ada-lex.c; \
- elif [ ! -f ada-lex.c -a ! -f $(srcdir)/ada-lex.c ]; then \
- echo "ada-lex.c missing and flex not available."; \
- false; \
- elif [ ! -f ada-lex.c ]; then \
- echo "Warning: ada-lex.c older than ada-lex.l and flex not available."; \
- fi
-
# p-exp.tab.c is generated in objdir from p-exp.y if it doesn't exist
# in srcdir, then compiled in objdir to p-exp.tab.o.
# Remove bogus decls for malloc/realloc/free which conflict with everything
@@ -1196,7 +1159,6 @@ p-exp.tab.c: p-exp.y
# These files are updated atomically, so make never has to remove them
.PRECIOUS: m2-exp.tab.c f-exp.tab.c c-exp.tab.c
.PRECIOUS: jv-exp.tab.c p-exp.tab.c
-.PRECIOUS: ada-exp.tab.c

lint: $(LINTFILES)
$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
@@ -1291,21 +1253,6 @@ udr.o: $(srcdir)/29k-share/udi/udr.c $(u
a68v-nat.o: a68v-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) \
$(regcache_h)

-ada-lang.o: ada-lang.c ada-lang.h c-lang.h $(defs_h) $(expression_h) \
- $(gdbtypes_h) $(inferior_h) language.h parser-defs.h $(symtab_h) \
- $(gdbcmd_h) $(ui_out_h) symfile.h objfiles.h $(gdbcore_h)
-
-ada-tasks.o: ada-tasks.c ada-lang.h $(defs_h) language.h $(value_h) \
- $(command_h) $(value_h) $(gdbcore_h)
-
-ada-typeprint.o: ada-typeprint.c ada-lang.h $(defs_h) $(expression_h) \
- $(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h $(symtab_h) \
- target.h typeprint.h $(value_h) ada-lang.h
-
-ada-valprint.o: ada-valprint.c $(defs_h) $(expression_h) $(gdbtypes_h) \
- language.h $(symtab_h) valprint.h $(value_h) c-lang.h ada-lang.h \
- annotate.h
-
alpha-nat.o: alpha-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) $(target_h) \
$(regcache_h) alpha-tdep.h

@@ -1458,10 +1405,6 @@ dbxread.o: dbxread.c $(breakpoint_h) $(b
$(stabsread_h) $(symfile_h) $(symtab_h) $(target_h) $(gdb_string_h) \
$(cp_abi_h)

-dec-thread.o: dec-thread.c $(defs_h) $(gdbcmd_h) $(inferior_h) \
- gdbthread.h target.h
- $(CC) -c $(INTERNAL_CFLAGS) -ansi $(srcdir)/dec-thread.c
-
delta68-nat.o: delta68-nat.c $(defs_h)

demangle.o: demangle.c $(defs_h) $(gdbcmd_h) $(gdb_string_h)
@@ -1521,7 +1464,6 @@ regcache.o: regcache.c $(defs_h) $(infer
fork-child.o: fork-child.c $(gdb_wait_h) $(defs_h) $(gdbcore_h) \
$(inferior_h) $(target_h) $(terminal_h) $(gdbthread_h) $(gdb_string_h)

-
install-gdbtk:
$(SHELL) $(srcdir)/../mkinstalldirs $(GDBTK_LIBRARY) ; \
$(SHELL) $(srcdir)/../mkinstalldirs \
@@ -2286,11 +2228,6 @@ z8k-tdep.o: z8k-tdep.c $(bfd_h) $(dis_as
$(regcache_h)
$(CC) -c $(INTERNAL_WARN_CFLAGS) $(NO_WERROR_CFLAGS) \
$(srcdir)/z8k-tdep.c
-
-ada-exp.tab.o: ada-exp.tab.c ada-lex.c ada-lang.h \
- $(defs_h) $(expression_h) \
- $(gdbtypes_h) language.h parser-defs.h $(symtab_h) $(value_h) \
- $(bfd_h) objfiles.h symfile.h

c-exp.tab.o: c-exp.tab.c $(defs_h) $(gdb_string_h) $(expression_h) \
$(value_h) $(parser_defs_h) $(language_h) $(c_lang_h) $(bfd_h) \