diff options
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/Make-lang.in | 16 | ||||
| -rw-r--r-- | gcc/objc/objc-parse.c | 6 | ||||
| -rw-r--r-- | gcc/objc/objc-parse.y | 2 |
3 files changed, 13 insertions, 11 deletions
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index f5f8289..4b41c9a 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 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998 Free Software Foundation, Inc. #This file is part of GNU CC. @@ -130,7 +130,7 @@ objc/sarray.o: $(srcdir)/objc/sarray.c $(GCC_PASSES) objc/class.o: $(srcdir)/objc/class.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/class.c -o $@ -objc/sendmsg.o: $(srcdir)/objc/sendmsg.c $(GCC_PASSES) +objc/sendmsg.o: $(srcdir)/objc/sendmsg.c $(GCC_PASSES) objc/runtime-info.h $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) -Iobjc \ -c $(srcdir)/objc/sendmsg.c -o $@ objc/init.o: $(srcdir)/objc/init.c $(GCC_PASSES) @@ -209,10 +209,10 @@ libobjc.dll: libobjc_s.a objc/libobjc_entry.o # Platform generated information needed by ObjC runtime objc/runtime-info.h: cc1obj - echo "" > emptyfile + echo "" > tmp-runtime echo "/* This file is automatically generated */" >$@ - ./cc1obj -print-objc-runtime-info emptyfile >>$@ - + ./cc1obj -print-objc-runtime-info tmp-runtime >>$@ + rm -f tmp-runtime # # Build hooks: @@ -301,9 +301,11 @@ objc.stage4: stage4-start # This target creates the files that can be rebuilt, but go in the # distribution anyway. It then copies the files to the distdir directory. -objc.distdir: +# ??? Note that this should be fixed once the Makefile is fixed to do +# the build in the inner directory. +objc.distdir: $(srcdir)/objc/objc-parse.c mkdir tmp/objc - cd objc ; $(MAKE) $(FLAGS_TO_PASS) objc-parse.c +# cd objc ; $(MAKE) $(FLAGS_TO_PASS) objc-parse.c cd objc; \ for file in *[0-9a-zA-Z+]; do \ ln $$file ../tmp/objc >/dev/null 2>&1 || cp $$file ../tmp/objc; \ diff --git a/gcc/objc/objc-parse.c b/gcc/objc/objc-parse.c index dde9480..cf3f3f7 100644 --- a/gcc/objc/objc-parse.c +++ b/gcc/objc/objc-parse.c @@ -1638,7 +1638,7 @@ static const short yycheck[] = { 9, 48, 49, 50, 51, 52 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/cygnus/latest-940103/share/bison.simple" +#line 3 "/usr/cygnus/progressive-97r2/share/bison.simple" /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -1831,7 +1831,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "/usr/cygnus/latest-940103/share/bison.simple" +#line 196 "/usr/cygnus/progressive-97r2/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -4911,7 +4911,7 @@ case 556: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/cygnus/latest-940103/share/bison.simple" +#line 498 "/usr/cygnus/progressive-97r2/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; diff --git a/gcc/objc/objc-parse.y b/gcc/objc/objc-parse.y index 1155473..807ad5a 100644 --- a/gcc/objc/objc-parse.y +++ b/gcc/objc/objc-parse.y @@ -1,6 +1,6 @@ /*WARNING: This file is automatically generated!*/ /* YACC parser for C syntax and for Objective C. -*-c-*- - Copyright (C) 1987, 88, 89, 92-6, 1997 Free Software Foundation, Inc. + Copyright (C) 1987, 88, 89, 92-97, 1998 Free Software Foundation, Inc. This file is part of GNU CC. |