aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNeil Booth <neilb@earthling.net>2000-11-29 22:19:28 +0000
committerNeil Booth <neil@gcc.gnu.org>2000-11-29 22:19:28 +0000
commit0eaed3c665d929d927cc9a94eba7819b352b970f (patch)
tree7ef9b7ed6f480f7ae377761c5cf50678c1a104d0 /gcc
parentfc81ccd3e5f9ce5a18c2e9e1519634ad9947e430 (diff)
downloadgcc-0eaed3c665d929d927cc9a94eba7819b352b970f.zip
gcc-0eaed3c665d929d927cc9a94eba7819b352b970f.tar.gz
gcc-0eaed3c665d929d927cc9a94eba7819b352b970f.tar.bz2
c-decl.c (c_decode_option): Don't handle -lang-objc.
* c-decl.c (c_decode_option): Don't handle -lang-objc. * objc/lang-options.h: Remove -lang-objc. * objc/lang-specs.h: Don't pass -lang-objc to cc1obj. * objc/objc-act.c (lang_init_options): Set c_language. From-SVN: r37859
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/c-decl.c4
-rw-r--r--gcc/objc/lang-options.h1
-rw-r--r--gcc/objc/lang-specs.h8
-rw-r--r--gcc/objc/objc-act.c3
5 files changed, 14 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed669b0..fcaa6fb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-29 Neil Booth <neilb@earthling.net>
+
+ * c-decl.c (c_decode_option): Don't handle -lang-objc.
+ * objc/lang-options.h: Remove -lang-objc.
+ * objc/lang-specs.h: Don't pass -lang-objc to cc1obj.
+ * objc/objc-act.c (lang_init_options): Set c_language.
+
2000-11-29 Jakub Jelinek <jakub@redhat.com>
* expr.c (can_store_by_pieces): Reinitialize max_size for reverse
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 8f8fbf8..98aae30 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -507,9 +507,7 @@ c_decode_option (argc, argv)
strings_processed = cpp_handle_option (parse_in, argc, argv);
- if (!strcmp (p, "-lang-objc"))
- c_language = clk_objective_c;
- else if (!strcmp (p, "-ftraditional") || !strcmp (p, "-traditional"))
+ if (!strcmp (p, "-ftraditional") || !strcmp (p, "-traditional"))
{
flag_traditional = 1;
flag_writable_strings = 1;
diff --git a/gcc/objc/lang-options.h b/gcc/objc/lang-options.h
index 987c375..bc51264 100644
--- a/gcc/objc/lang-options.h
+++ b/gcc/objc/lang-options.h
@@ -27,7 +27,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
DEFINE_LANG_NAME ("Objective C")
- { "-lang-objc", "" },
{ "-gen-decls", "Dump decls to a .decl file" },
{ "-fgnu-runtime", "Generate code for GNU runtime environment" },
{ "-fno-gnu-runtime", "" },
diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h
index 6fefc93..e732d00 100644
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
@@ -29,15 +29,15 @@ Boston, MA 02111-1307, USA. */
%{!E:%{!M:%{!MM:\
%{save-temps:%(trad_capable_cpp) -lang-objc %{ansi:-std=c89}\
%(cpp_options) %b.mi \n\
- cc1obj -fpreprocessed %b.mi -lang-objc %(cc1_options) %{gen-decls}}\
+ cc1obj -fpreprocessed %b.mi %(cc1_options) %{gen-decls}}\
%{!save-temps:\
%{traditional|ftraditional|traditional-cpp:\
tradcpp0 -lang-objc %{ansi:-std=c89} %(cpp_options) %{!pipe:%g.mi} |\n\
- cc1obj -fpreprocessed %{!pipe:%g.mi} -lang-objc %(cc1_options) %{gen-decls}}\
+ cc1obj -fpreprocessed %{!pipe:%g.mi} %(cc1_options) %{gen-decls}}\
%{!traditional:%{!ftraditional:%{!traditional-cpp:\
- cc1obj -lang-objc %{ansi:-std=c89} %(cpp_options) %(cc1_options) %{gen-decls}}}}}\
+ cc1obj %{ansi:-std=c89} %(cpp_options) %(cc1_options) %{gen-decls}}}}}\
%{!fsyntax-only:%(invoke_as)}}}}"},
{".mi", "@objc-cpp-output"},
{"@objc-cpp-output",
- "%{!M:%{!MM:%{!E:cc1obj -lang-objc %i %(cc1_options) %{gen-decls}\
+ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{gen-decls}\
%{!fsyntax-only:%(invoke_as)}}}}"},
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index e15ddd0..f0fc06b 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -694,7 +694,8 @@ generate_struct_by_value_array ()
void
lang_init_options ()
{
- parse_in = cpp_create_reader (CLK_GNUC89);
+ parse_in = cpp_create_reader (CLK_OBJC);
+ c_language = clk_objective_c;
}
void