diff options
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/objc/Make-lang.in | 29 | ||||
| -rw-r--r-- | gcc/objc/config-lang.in | 4 |
3 files changed, 14 insertions, 27 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 88037f3..49e73af 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,11 @@ +2005-02-25 Joseph S. Myers <joseph@codesourcery.com> + + * Make-lang.in (objc/objc-parse.o-warn, objc/objc-parse.o, + objc/objc-parse.c, objc/objc-parse.y): Remove + (OBJC_OBJS, objc.srcextra, objc.tags, objc.mostlyclean, + objc.distclean, objc.maintainer-clean): Update for new parser. + * config-lang.in (gtfiles): Update for new parser. + 2005-01-29 Kazu Hirata <kazu@cs.umass.edu> * lang-specs.h, objc-act.c, objc-act.h, objc-lang.c: Update diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index 0890943..56fad72 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -1,5 +1,5 @@ # Top level -*- makefile -*- fragment for GNU Objective-C -# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. #This file is part of GCC. @@ -46,11 +46,9 @@ OBJECTIVE-C objective-c: cc1obj$(exeext) # Use maximal warnings for this front end. objc-warn = $(STRICT_WARN) -# Bison-1.75 output yields (harmless) -Wtraditional warnings -objc/objc-parse.o-warn = -Wno-error # Language-specific object files for Objective C. -OBJC_OBJS = objc/objc-lang.o objc/objc-parse.o objc/objc-act.o +OBJC_OBJS = objc/objc-lang.o objc/objc-act.o cc1obj$(exeext): $(OBJC_OBJS) $(C_AND_OBJC_OBJS) $(BACKEND) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ @@ -64,28 +62,13 @@ objc/objc-lang.o : objc/objc-lang.c \ $(GGC_H) langhooks.h $(LANGHOOKS_DEF_H) $(C_COMMON_H) gtype-objc.h \ c-objc-common.h objc/objc-act.h -objc/objc-parse.o : objc/objc-parse.c \ - $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \ - toplev.h $(GGC_H) input.h flags.h output.h langhooks.h $(C_COMMON_H) \ - $(C_PRAGMA_H) - objc/objc-act.o : objc/objc-act.c \ $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) $(TM_P_H) \ $(EXPR_H) $(TARGET_H) $(C_TREE_H) diagnostic.h toplev.h flags.h \ objc/objc-act.h input.h function.h output.h debug.h langhooks.h \ $(LANGHOOKS_DEF_H) $(HASHTAB_H) c-pragma.h gt-objc-objc-act.h -objc.srcextra: objc/objc-parse.c objc/objc-parse.y - -cp -p $^ $(srcdir)/objc - -objc/objc-parse.c : objc/objc-parse.y - -$(BISON) $(BISONFLAGS) -o $@ $< - -objc/objc-parse.y: 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" < $< >>tmp-objc-prs.y - $(SHELL) $(srcdir)/../move-if-change tmp-objc-prs.y $@ +objc.srcextra: gtype-objc.h : s-gtype ; @true gt-objc-objc-act.h : s-gtype ; @true @@ -103,7 +86,7 @@ objc.srcinfo: objc.srcman: objc.tags: force - cd $(srcdir)/objc; etags -o TAGS.sub *.y *.c *.h; \ + cd $(srcdir)/objc; etags -o TAGS.sub *.c *.h; \ etags --include TAGS.sub --include ../TAGS.sub lang_checks += check-objc @@ -124,18 +107,14 @@ objc.uninstall: # A lot of the ancillary files are deleted by the main makefile. # We just have to delete files specific to us. objc.mostlyclean: - -rm -f tmp-objc-prs.y -rm -f objc/*$(objext) objc/xforward objc/fflags - -rm -f objc/objc-parse.y objc/objc-parse.c objc/objc-parse.output -rm -f objc/*$(coverageexts) objc.clean: objc.mostlyclean -rm -rf objc-headers 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.maintainer-clean: - -rm -f $(srcdir)/objc/objc-parse.y $(srcdir)/objc/objc-parse.c # # Stage hooks: diff --git a/gcc/objc/config-lang.in b/gcc/objc/config-lang.in index 72de2ff..fbb9a6e 100644 --- a/gcc/objc/config-lang.in +++ b/gcc/objc/config-lang.in @@ -1,5 +1,5 @@ # Top level configure fragment for GNU Objective-C -# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 +# Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. #This file is part of GCC. @@ -37,4 +37,4 @@ target_libs=target-libobjc # Most of the object files for cc1obj actually come from C. lang_requires="c" -gtfiles="\$(srcdir)/objc/objc-act.h \$(srcdir)/c-parse.in \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-objc-common.c \$(srcdir)/c-common.c \$(srcdir)/c-common.h \$(srcdir)/c-pragma.c \$(srcdir)/objc/objc-act.c" +gtfiles="\$(srcdir)/objc/objc-act.h \$(srcdir)/c-parser.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-objc-common.c \$(srcdir)/c-common.c \$(srcdir)/c-common.h \$(srcdir)/c-pragma.c \$(srcdir)/objc/objc-act.c" |