From 3028a95cd6090610044464270181aeb6a72ab154 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 2 Dec 2010 19:39:16 +0000 Subject: [PATCH] gcc.c (trad_capable_cpp, [...]): Don't handle -ftraditional. * gcc.c (trad_capable_cpp, default_compilers): Don't handle -ftraditional. objc: * lang-specs.h: Don't handle -ftraditional. From-SVN: r167385 --- gcc/ChangeLog | 5 +++++ gcc/gcc.c | 4 ++-- gcc/objc/ChangeLog | 4 ++++ gcc/objc/lang-specs.h | 10 +++++----- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3a060e8b2c03..64eaa71a7234 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-12-02 Joseph Myers + + * gcc.c (trad_capable_cpp, default_compilers): Don't handle + -ftraditional. + 2010-12-02 Joseph Myers * config/alpha/freebsd.h (LINK_SPEC): Don't handle -Wl,. diff --git a/gcc/gcc.c b/gcc/gcc.c index d6f0a0812f66..ab11277389f7 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -709,7 +709,7 @@ static const char *sysroot_hdrs_suffix_spec = SYSROOT_HEADERS_SUFFIX_SPEC; call cc1 (or cc1obj in objc/lang-specs.h) from the main specs so that we default the front end language better. */ static const char *trad_capable_cpp = -"cc1 -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}"; +"cc1 -E %{traditional|traditional-cpp:-traditional-cpp}"; /* We don't wrap .d files in %W{} since a missing .d file, and therefore no dependency entry, confuses make into thinking a .o @@ -903,7 +903,7 @@ static const struct compiler default_compilers[] = external preprocessor if -save-temps is given. */ "%{E|M|MM:%(trad_capable_cpp) %(cpp_options) %(cpp_debug_options)}\ %{!E:%{!M:%{!MM:\ - %{traditional|ftraditional:\ + %{traditional:\ %eGNU C no longer supports -traditional without -E}\ %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \ %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\ diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 70ca6a8807e6..ca63d7ba104f 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,7 @@ +2010-12-02 Joseph Myers + + * lang-specs.h: Don't handle -ftraditional. + 2010-12-02 Nicola Pero * objc-act.c (objc_build_throw_stmt): Return error_mark_node and diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h index f6a8f3815d14..70d9bba117b0 100644 --- a/gcc/objc/lang-specs.h +++ b/gcc/objc/lang-specs.h @@ -1,5 +1,5 @@ /* Definitions for specs for Objective-C. - Copyright (C) 1998, 1999, 2002, 2002, 2003, 2005, 2007 + Copyright (C) 1998, 1999, 2002, 2002, 2003, 2005, 2007, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -24,10 +24,10 @@ along with GCC; see the file COPYING3. If not see {".m", "@objective-c", 0, 0, 0}, {"@objective-c", - "%{E|M|MM:cc1obj -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}\ + "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\ %(cpp_options) %(cpp_debug_options)}\ %{!E:%{!M:%{!MM:\ - %{traditional|ftraditional|traditional-cpp:\ + %{traditional|traditional-cpp:\ %eGNU Objective C no longer supports traditional compilation}\ %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\ cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\ @@ -35,10 +35,10 @@ along with GCC; see the file COPYING3. If not see cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, {"@objective-c-header", - "%{E|M|MM:cc1obj -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}\ + "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\ %(cpp_options) %(cpp_debug_options)}\ %{!E:%{!M:%{!MM:\ - %{traditional|ftraditional|traditional-cpp:\ + %{traditional|traditional-cpp:\ %eGNU Objective C no longer supports traditional compilation}\ %{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\ cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\