diff options
Diffstat (limited to 'gcc/objc')
-rw-r--r-- | gcc/objc/Make-lang.in | 43 | ||||
-rw-r--r-- | gcc/objc/objc-parse.c | 61 |
2 files changed, 52 insertions, 52 deletions
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index d3001ed..0dcd59c 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -121,58 +121,59 @@ OBJC_O = objc/hash.o objc/sarray.o \ objc/thr.o objc/linking.o \ objc/$(OBJC_THREAD_FILE).o -objc/hash.o: $(srcdir)/objc/hash.c +objc/hash.o: $(srcdir)/objc/hash.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/hash.c -o $@ -objc/sarray.o: $(srcdir)/objc/sarray.c +objc/sarray.o: $(srcdir)/objc/sarray.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/sarray.c -o $@ -objc/class.o: $(srcdir)/objc/class.c +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 +objc/sendmsg.o: $(srcdir)/objc/sendmsg.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/sendmsg.c -o $@ -objc/init.o: $(srcdir)/objc/init.c +objc/init.o: $(srcdir)/objc/init.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/init.c -o $@ -objc/archive.o: $(srcdir)/objc/archive.c +objc/archive.o: $(srcdir)/objc/archive.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/archive.c -o $@ -objc/encoding.o: $(srcdir)/objc/encoding.c +objc/encoding.o: $(srcdir)/objc/encoding.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/encoding.c -o $@ -objc/selector.o: $(srcdir)/objc/selector.c +objc/selector.o: $(srcdir)/objc/selector.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/selector.c -o $@ -objc/objects.o: $(srcdir)/objc/objects.c +objc/objects.o: $(srcdir)/objc/objects.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/objects.c -o $@ -objc/misc.o: $(srcdir)/objc/misc.c +objc/misc.o: $(srcdir)/objc/misc.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/misc.c -o $@ -objc/NXConstStr.o: $(srcdir)/objc/NXConstStr.m +objc/NXConstStr.o: $(srcdir)/objc/NXConstStr.m $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/NXConstStr.m -o $@ -objc/Object.o: $(srcdir)/objc/Object.m +objc/Object.o: $(srcdir)/objc/Object.m $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/Object.m -o $@ -objc/Protocol.o: $(srcdir)/objc/Protocol.m +objc/Protocol.o: $(srcdir)/objc/Protocol.m $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/Protocol.m -o $@ -objc/thr.o: $(srcdir)/objc/thr.h $(srcdir)/objc/thr.c +objc/thr.o: $(srcdir)/objc/thr.h $(srcdir)/objc/thr.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/thr.c -o $@ -objc/$(OBJC_THREAD_FILE).o: $(srcdir)/objc/$(OBJC_THREAD_FILE).c +objc/$(OBJC_THREAD_FILE).o: $(srcdir)/objc/$(OBJC_THREAD_FILE).c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/$(OBJC_THREAD_FILE).c -o $@ -objc/nil_method.o: $(srcdir)/objc/nil_method.c +objc/nil_method.o: $(srcdir)/objc/nil_method.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/nil_method.c -o $@ -objc/linking.o: $(srcdir)/objc/linking.m +objc/linking.o: $(srcdir)/objc/linking.m $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/linking.m -o $@ -$(srcdir)/objc/libobjc_entry.o: $(srcdir)/objc/libobjc_entry.c + +$(srcdir)/objc/libobjc_entry.o: $(srcdir)/objc/libobjc_entry.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) \ -c $(srcdir)/objc/libobjc_entry.c -o $@ @@ -294,3 +295,9 @@ objc.stage4: # 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: + mkdir tmp/objc + 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; \ + done diff --git a/gcc/objc/objc-parse.c b/gcc/objc/objc-parse.c index 9c80c87..3734a97 100644 --- a/gcc/objc/objc-parse.c +++ b/gcc/objc/objc-parse.c @@ -1,5 +1,6 @@ -/* A Bison parser, made from objc-parse.y with Bison version GNU Bison version 1.24 +/* A Bison parser, made from objc-parse.y + by GNU Bison version 1.25 */ #define YYBISON 1 /* Identify Bison output. */ @@ -142,23 +143,6 @@ int objc_public_flag; #define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL) extern void yyprint (); - -#ifndef YYLTYPE -typedef - struct yyltype - { - int timestamp; - int first_line; - int first_column; - int last_line; - int last_column; - char *text; - } - yyltype; - -#define YYLTYPE yyltype -#endif - #include <stdio.h> #ifndef __cplusplus @@ -507,6 +491,10 @@ static const short yyrline[] = { 0, 2868, 2873, 2879, 2881, 2887, 2891, 2892, 2898, 2900, 2903, 2905, 2911, 2916, 2922, 2929, 2938 }; +#endif + + +#if YYDEBUG != 0 || defined (YYERROR_VERBOSE) static const char * const yytname[] = { "$","error","$undefined.","IDENTIFIER", "TYPENAME","SCSPEC","TYPESPEC","TYPE_QUAL","CONSTANT","STRING","ELLIPSIS","SIZEOF", @@ -549,8 +537,7 @@ static const char * const yytname[] = { "$","error","$undefined.","IDENTIFIER" "myxdecls","mydecls","mydecl","myparms","myparm","optparmlist","@64","unaryselector", "keywordselector","selector","reservedwords","keyworddecl","messageargs","keywordarglist", "keywordexpr","keywordarg","receiver","objcmessageexpr","@65","@66","selectorarg", -"keywordnamelist","keywordname","objcselectorexpr","objcprotocolexpr","objcencodeexpr", -"" +"keywordnamelist","keywordname","objcselectorexpr","objcprotocolexpr","objcencodeexpr", NULL }; #endif @@ -1652,7 +1639,7 @@ static const short yycheck[] = { 9, 48, 49, 50, 51, 52 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/local/share/bison.simple" +#line 3 "/usr/cygnus/latest-940103/share/bison.simple" /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -1807,16 +1794,16 @@ int yyparse (void); #endif #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ -#define __yy_memcpy(FROM,TO,COUNT) __builtin_memcpy(TO,FROM,COUNT) +#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) #else /* not GNU C or C++ */ #ifndef __cplusplus /* This is the most reliable way to avoid incompatibilities in available built-in functions on various systems. */ static void -__yy_memcpy (from, to, count) - char *from; +__yy_memcpy (to, from, count) char *to; + char *from; int count; { register char *f = from; @@ -1832,7 +1819,7 @@ __yy_memcpy (from, to, count) /* This is the most reliable way to avoid incompatibilities in available built-in functions on various systems. */ static void -__yy_memcpy (char *from, char *to, int count) +__yy_memcpy (char *to, char *from, int count) { register char *f = from; register char *t = to; @@ -1845,7 +1832,7 @@ __yy_memcpy (char *from, char *to, int count) #endif #endif -#line 192 "/usr/local/share/bison.simple" +#line 196 "/usr/cygnus/latest-940103/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 *. @@ -1854,14 +1841,20 @@ __yy_memcpy (char *from, char *to, int count) to the proper pointer type. */ #ifdef YYPARSE_PARAM +#ifdef __cplusplus +#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM +#define YYPARSE_PARAM_DECL +#else /* not __cplusplus */ +#define YYPARSE_PARAM_ARG YYPARSE_PARAM #define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -#else -#define YYPARSE_PARAM +#endif /* not __cplusplus */ +#else /* not YYPARSE_PARAM */ +#define YYPARSE_PARAM_ARG #define YYPARSE_PARAM_DECL -#endif +#endif /* not YYPARSE_PARAM */ int -yyparse(YYPARSE_PARAM) +yyparse(YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL { register int yystate; @@ -1978,12 +1971,12 @@ yynewstate: if (yystacksize > YYMAXDEPTH) yystacksize = YYMAXDEPTH; yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp)); + __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp)); yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp)); + __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp)); #ifdef YYLSP_NEEDED yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp)); + __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp)); #endif #endif /* no yyoverflow */ @@ -4911,7 +4904,7 @@ case 556: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 487 "/usr/local/share/bison.simple" +#line 498 "/usr/cygnus/latest-940103/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; |