diff options
| author | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-07-29 19:45:41 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2000-07-29 19:45:41 +0000 |
| commit | c09cda19a6f9d172ea46cb93f3527b2c1c8c79ad (patch) | |
| tree | 5032dfd5862062df7b9cc8a894a6fb00b77b1abf /gcc | |
| parent | b3e247b8117c62d94da6298ddfc725fe7132bbb6 (diff) | |
| download | gcc-c09cda19a6f9d172ea46cb93f3527b2c1c8c79ad.zip gcc-c09cda19a6f9d172ea46cb93f3527b2c1c8c79ad.tar.gz gcc-c09cda19a6f9d172ea46cb93f3527b2c1c8c79ad.tar.bz2 | |
Revert previous checkin.
From-SVN: r35331
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 17 | ||||
| -rw-r--r-- | gcc/objc/Make-lang.in | 19 |
3 files changed, 19 insertions, 22 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2906118..0aeec92 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,8 +1,3 @@ -2000-07-29 Marc Espie <espie@openbsd.org> - - * Makefile.in: Generate objc parser along with the C parser. - * objc/Make-lang.in: Remove generation of objc parser. - 2000-07-27 Mark Mitchell <mark@codesourcery.com> Put phi nodes after NOTE_INSN_BASIC_BLOCK. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index b2414e7..83213d1 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1077,23 +1077,15 @@ c-parse.o : $(srcdir)/c-parse.c $(CONFIG_H) $(TREE_H) c-lex.h $(GGC_H) \ $(srcdir)/c-parse.h c-tree.h c-common.h input.h flags.h system.h \ toplev.h output.h $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c $(srcdir)/c-parse.c - -$(srcdir)/c-parse.h $(srcdir)/c-parse.c $(srcdir)/objc-parse.c: \ - $(srcdir)/c-parse.y $(srcdir)/objc-parse.y +$(srcdir)/c-parse.h: $(srcdir)/c-parse.c +$(srcdir)/c-parse.c: $(srcdir)/c-parse.y cd $(srcdir); $(BISON) $(BISONFLAGS) -d -o c-parse.c c-parse.y - cd $(srcdir); $(BISON) $(BISONFLAGS) -o objc-parse.c objc-parse.y - -$(srcdir)/c-parse.y $(srcdir)/objc-parse.y: c-parse.in +$(srcdir)/c-parse.y: c-parse.in echo '/*WARNING: This file is automatically generated!*/' >tmp-c-parse.y sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \ -e "/^ifc$$/d" -e "/^end ifc$$/d" \ $(srcdir)/c-parse.in >>tmp-c-parse.y $(SHELL) $(srcdir)/move-if-change tmp-c-parse.y $(srcdir)/c-parse.y - echo '/*WARNING: This file is automatically generated!*/' >tmp-objc-prs.y - sed -e "/^ifc$$/,/^end ifc$$/d" \ - -e "/^ifobjc$$/d" -e "/^end ifobjc$$/d" \ - $(srcdir)/c-parse.in >>tmp-objc-prs.y - $(SHELL) $(srcdir)/move-if-change tmp-objc-prs.y $(srcdir)/objc-parse.y $(srcdir)/c-gperf.h: c-parse.gperf gperf -L C -F ', 0, 0' -p -j1 -i 1 -g -o -t -G -N is_reserved_word \ @@ -2194,7 +2186,6 @@ distclean: clean $(INTL_DISTCLEAN) lang.distclean -rm -f gthr-default.h -rm -f */stage1 */stage2 */stage3 */stage4 */include -rm -f c-parse.output - -rm -f objc-parse.output -rm -f *.asm -rm -f float.h -rm -f site.exp site.bak testsuite/site.exp testsuite/site.bak @@ -2230,8 +2221,6 @@ maintainer-clean: $(MAKE) INTL_DISTCLEAN= INTL_CLEAN= INTL_MOSTLYCLEAN= \ intl.maintainer-clean lang.maintainer-clean distclean -rm -f c-parse.y c-gperf.h - -rm -f objc-parse.y - -rm -f objc-parse.c objc-parse.output -rm -f c-parse.c c-parse.h c-parse.output TAGS -rm -f cpp.info* cpp.??s cpp.*aux -rm -f gcc.info* gcc.??s gcc.*aux diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index 636da34..089f714 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -64,15 +64,25 @@ cc1obj$(exeext): $(P) $(OBJS) $(OBJC_OBJS) $(LIBDEPS) # Objective C language specific files. -objc-parse.o : $(srcdir)/objc-parse.c \ +objc-parse.o : $(srcdir)/objc/objc-parse.c \ $(CONFIG_H) $(TREE_H) $(srcdir)/toplev.h $(srcdir)/ggc.h \ $(srcdir)/c-lex.h $(srcdir)/c-tree.h $(srcdir)/c-common.h \ $(srcdir)/input.h $(srcdir)/flags.h $(srcdir)/output.h \ $(srcdir)/objc/objc-act.h system.h $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -I$(srcdir)/objc \ - -c $(srcdir)/objc-parse.c + -c $(srcdir)/objc/objc-parse.c -$(INTL_TARGETS): $(srcdir)/objc-parse.c +$(INTL_TARGETS): $(srcdir)/objc/objc-parse.c +$(srcdir)/objc/objc-parse.c : $(srcdir)/objc/objc-parse.y + cd $(srcdir)/objc; \ + $(BISON) $(BISONFLAGS) -o objc-parse.c objc-parse.y + +$(srcdir)/objc/objc-parse.y: $(srcdir)/c-parse.in + echo '/*WARNING: This file is automatically generated!*/' >tmp-objc-prs.y + sed -e "/^ifc$$/,/^end ifc$$/d" \ + -e "/^ifobjc$$/d" -e "/^end ifobjc$$/d" \ + $(srcdir)/c-parse.in >>tmp-objc-prs.y + $(SHELL) $(srcdir)/move-if-change tmp-objc-prs.y $(srcdir)/objc/objc-parse.y objc-act.o : $(srcdir)/objc/objc-act.c \ $(CONFIG_H) $(TREE_H) $(RTL_H) system.h \ @@ -119,8 +129,11 @@ objc.clean: objc.mostlyclean objc.distclean: -rm -f objc/Makefile objc/Make-host objc/Make-target -rm -f objc/config.status objc/config.cache + -rm -f objc-parse.output objc.extraclean: objc.maintainer-clean: + -rm -f objc/objc-parse.y + -rm -f objc/objc-parse.c objc/objc-parse.output # # Stage hooks: |