gcc.c: Split out Objective-C specs to...
* gcc.c: Split out Objective-C specs to...
* objc/lang-specs.h: here. (New file.) Make the specs cpplib
aware.
* c-lex.c (init_parse): Always initialize the filename global.
* objc/objc-act.c (lang_init): Always call check_newline at
beginning of file.
From-SVN: r23850
This commit is contained in:
Zack Weinberg
Jeff Law
parent
a64f294eea
commit
b12da25e3e
@ -1,3 +1,13 @@
|
||||
1998-11-25 07:51 -0500 Zack Weinberg <zack@rabi.phys.columbia.edu>
|
||||
|
||||
* gcc.c: Split out Objective-C specs to...
|
||||
* objc/lang-specs.h: here. (New file.) Make the specs cpplib
|
||||
aware.
|
||||
|
||||
* c-lex.c (init_parse): Always initialize the filename global.
|
||||
* objc/objc-act.c (lang_init): Always call check_newline at
|
||||
beginning of file.
|
||||
|
||||
Wed Nov 25 00:48:29 1998 Graham <grahams@rcp.co.uk>
|
||||
|
||||
* reload1.c (reload): Remove unused variable.
|
||||
|
||||
11
gcc/c-lex.c
11
gcc/c-lex.c
@ -189,21 +189,22 @@ init_parse (filename)
|
||||
#ifdef IO_BUFFER_SIZE
|
||||
setvbuf (finput, (char *) xmalloc (IO_BUFFER_SIZE), _IOFBF, IO_BUFFER_SIZE);
|
||||
#endif
|
||||
#endif /* !USE_CPPLIB */
|
||||
|
||||
init_lex ();
|
||||
|
||||
#if USE_CPPLIB
|
||||
#else /* !USE_CPPLIB */
|
||||
parse_in.show_column = 1;
|
||||
if (! cpp_start_read (&parse_in, filename))
|
||||
abort ();
|
||||
|
||||
if (filename == 0 || !strcmp (filename, "-"))
|
||||
filename = "stdin";
|
||||
|
||||
/* cpp_start_read always puts at least one line directive into the
|
||||
token buffer. We must arrange to read it out here. */
|
||||
yy_cur = parse_in.token_buffer;
|
||||
yy_lim = CPP_PWRITTEN (&parse_in);
|
||||
#endif
|
||||
|
||||
init_lex ();
|
||||
|
||||
return filename;
|
||||
}
|
||||
|
||||
|
||||
31
gcc/gcc.c
31
gcc/gcc.c
@ -581,8 +581,10 @@ static struct compiler default_compilers[] =
|
||||
were not present when we built the driver, we will hit these copies
|
||||
and be given a more meaningful error than "file not used since
|
||||
linking is not done". */
|
||||
{".cc", {"#C++"}}, {".cxx", {"#C++"}}, {".cpp", {"#C++"}}, {".c++", {"#C++"}},
|
||||
{".C", {"#C++"}}, {".ads", {"#Ada"}}, {".adb", {"#Ada"}}, {".ada", {"#Ada"}},
|
||||
{".m", {"#Objective-C"}},
|
||||
{".cc", {"#C++"}}, {".cxx", {"#C++"}}, {".cpp", {"#C++"}},
|
||||
{".c++", {"#C++"}}, {".C", {"#C++"}},
|
||||
{".ads", {"#Ada"}}, {".adb", {"#Ada"}}, {".ada", {"#Ada"}},
|
||||
{".f", {"#Fortran"}}, {".for", {"#Fortran"}}, {".F", {"#Fortran"}},
|
||||
{".fpp", {"#Fortran"}},
|
||||
{".p", {"#Pascal"}}, {".pas", {"#Pascal"}},
|
||||
@ -664,31 +666,6 @@ static struct compiler default_compilers[] =
|
||||
%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
|
||||
%i %W{o*}}\
|
||||
%{!E:%e-E required when input is from standard input}"}},
|
||||
{".m", {"@objective-c"}},
|
||||
{"@objective-c",
|
||||
{"cpp -lang-objc %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
|
||||
%{C:%{!E:%eGNU C does not support -C without using -E}}\
|
||||
%{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
|
||||
-undef -D__OBJC__ -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
|
||||
%{ansi:-trigraphs -D__STRICT_ANSI__}\
|
||||
%{!undef:%{!ansi:%p} %P} %{trigraphs}\
|
||||
%c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
|
||||
%{traditional} %{ftraditional:-traditional}\
|
||||
%{traditional-cpp:-traditional}\
|
||||
%{fleading-underscore} %{fno-leading-underscore}\
|
||||
%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
|
||||
%i %{!M:%{!MM:%{!E:%{!pipe:%g.i}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
|
||||
"%{!M:%{!MM:%{!E:cc1obj %{!pipe:%g.i} %1 \
|
||||
%{!Q:-quiet} -dumpbase %b.m %{d*} %{m*} %{a*}\
|
||||
%{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi} \
|
||||
%{traditional} %{v:-version} %{pg:-p} %{p} %{f*} \
|
||||
-lang-objc %{gen-decls} \
|
||||
%{aux-info*}\
|
||||
%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
|
||||
%{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
|
||||
%{!S:as %a %Y\
|
||||
%{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
|
||||
%{!pipe:%g.s} %A\n }}}}"}},
|
||||
{".h", {"@c-header"}},
|
||||
{"@c-header",
|
||||
{"%{!E:%eCompilation of header file requested} \
|
||||
|
||||
92
gcc/objc/lang-specs.h
Normal file
92
gcc/objc/lang-specs.h
Normal file
@ -0,0 +1,92 @@
|
||||
/* Definitions for specs for Objective-C.
|
||||
Copyright (C) 1998 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU CC.
|
||||
|
||||
GNU CC is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2, or (at your option)
|
||||
any later version.
|
||||
|
||||
GNU CC is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GNU CC; see the file COPYING. If not, write to
|
||||
the Free Software Foundation, 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
/* This is the contribution to the `default_compilers' array in gcc.c for
|
||||
objc. */
|
||||
|
||||
{".m", {"@objective-c"}},
|
||||
{"@objective-c",
|
||||
#if USE_CPPLIB
|
||||
{"%{E|M|MM:cpp -lang-objc %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
|
||||
%{C:%{!E:%eGNU C does not support -C without using -E}}\
|
||||
%{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
|
||||
-undef -D__OBJC__ -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
|
||||
%{ansi:-trigraphs -D__STRICT_ANSI__}\
|
||||
%{!undef:%{!ansi:%p} %P} %{trigraphs}\
|
||||
%c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
|
||||
%{traditional} %{ftraditional:-traditional}\
|
||||
%{traditional-cpp:-traditional}\
|
||||
%{fleading-underscore} %{fno-leading-underscore}\
|
||||
%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
|
||||
%i %{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}}\n}",
|
||||
"%{!M:%{!MM:%{!E:cc1obj %i %1 \
|
||||
%{nostdinc*} %{A*} %{I*} %{P} %I\
|
||||
-undef -D__OBJC__ -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
|
||||
%{!undef:%{!ansi:%p} %P} %{trigraphs}\
|
||||
%c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
|
||||
%{!Q:-quiet} -dumpbase %b.m %{d*} %{m*} %{a*}\
|
||||
%{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi} \
|
||||
%{traditional} %{v:-version} %{pg:-p} %{p} %{f*} \
|
||||
-lang-objc %{gen-decls} \
|
||||
%{aux-info*}\
|
||||
%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
|
||||
%{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
|
||||
%{!S:as %a %Y\
|
||||
%{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
|
||||
%{!pipe:%g.s} %A\n }}}}"}
|
||||
#else /* ! USE_CPPLIB */
|
||||
{"cpp -lang-objc %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
|
||||
%{C:%{!E:%eGNU C does not support -C without using -E}}\
|
||||
%{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
|
||||
-undef -D__OBJC__ -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
|
||||
%{ansi:-trigraphs -D__STRICT_ANSI__}\
|
||||
%{!undef:%{!ansi:%p} %P} %{trigraphs}\
|
||||
%c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
|
||||
%{traditional} %{ftraditional:-traditional}\
|
||||
%{traditional-cpp:-traditional}\
|
||||
%{fleading-underscore} %{fno-leading-underscore}\
|
||||
%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
|
||||
%i %{!M:%{!MM:%{!E:%{!pipe:%g.mi}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
|
||||
"%{!M:%{!MM:%{!E:cc1obj %{!pipe:%g.mi} %1 \
|
||||
%{!Q:-quiet} -dumpbase %b.m %{d*} %{m*} %{a*}\
|
||||
%{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi} \
|
||||
%{traditional} %{v:-version} %{pg:-p} %{p} %{f*} \
|
||||
-lang-objc %{gen-decls} \
|
||||
%{aux-info*}\
|
||||
%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
|
||||
%{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
|
||||
%{!S:as %a %Y\
|
||||
%{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
|
||||
%{!pipe:%g.s} %A\n }}}}"}
|
||||
#endif /* ! USE_CPPLIB */
|
||||
},
|
||||
{".mi", {"@objc-cpp-output"}},
|
||||
{"@objc-cpp-output",
|
||||
{"%{!M:%{!MM:%{!E:cc1obj %{!pipe:%g.i} %1 \
|
||||
%{!Q:-quiet} -dumpbase %b.m %{d*} %{m*} %{a*}\
|
||||
%{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi} \
|
||||
%{traditional} %{v:-version} %{pg:-p} %{p} %{f*} \
|
||||
-lang-objc %{gen-decls} \
|
||||
%{aux-info*}\
|
||||
%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
|
||||
%{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n",
|
||||
"%{!S:as %a %Y\
|
||||
%{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
|
||||
%{!pipe:%g.s} %A\n }}}}"}},
|
||||
@ -592,6 +592,10 @@ generate_struct_by_value_array ()
|
||||
exit (0);
|
||||
}
|
||||
|
||||
#if USE_CPPLIB
|
||||
extern char *yy_cur;
|
||||
#endif
|
||||
|
||||
void
|
||||
lang_init_options ()
|
||||
{
|
||||
@ -605,7 +609,10 @@ lang_init ()
|
||||
With luck, we discover the real source file's name from that
|
||||
and put it in input_filename. */
|
||||
ungetc (check_newline (), finput);
|
||||
#endif
|
||||
#else
|
||||
check_newline ();
|
||||
yy_cur--;
|
||||
#endif
|
||||
|
||||
/* The line number can be -1 if we had -g3 and the input file
|
||||
had a directive specifying line 0. But we want predefined
|
||||
|
||||
Loading…
Reference in New Issue
Block a user