From 418f840c1b52c1ff7884e54b70164490b3025d5c Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 25 Jun 2010 01:26:24 +0100 Subject: [PATCH] gcc.c (translate_options): Don't mention +e in comment. * gcc.c (translate_options): Don't mention +e in comment. (process_command): Don't handle +e specially. cp: * lang-specs.h: Remove +e handling. objcp: * lang-specs.h: Remove +e handling. From-SVN: r161355 --- gcc/ChangeLog | 5 +++++ gcc/cp/ChangeLog | 4 ++++ gcc/cp/lang-specs.h | 8 ++++---- gcc/gcc.c | 18 +----------------- gcc/objcp/ChangeLog | 4 ++++ gcc/objcp/lang-specs.h | 10 +++++----- 6 files changed, 23 insertions(+), 26 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 22f1ca82764..aca7027e5e7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-06-25 Joseph Myers + + * gcc.c (translate_options): Don't mention +e in comment. + (process_command): Don't handle +e specially. + 2010-06-25 Bernd Schmidt * ira.c (allocno_pool, copy_pool, allocno_live_range_pool): Delete. diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b5ba3bc6e58..3093f0d9c9a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2010-06-25 Joseph Myers + + * lang-specs.h: Remove +e handling. + 2010-06-24 Andi Kleen * parser.c: (cp_parser_question_colon_clause): diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h index 8aa3adf61a7..24213587f76 100644 --- a/gcc/cp/lang-specs.h +++ b/gcc/cp/lang-specs.h @@ -1,6 +1,6 @@ /* Definitions for specs for C++. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2007 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2007, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -47,7 +47,7 @@ along with GCC; see the file COPYING3. If not see %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\ cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\ - %(cc1_options) %2 %{+e1*}\ + %(cc1_options) %2\ %{!fsyntax-only:%{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\ %W{o*:--output-pch=%*}}%V}}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, @@ -58,11 +58,11 @@ along with GCC; see the file COPYING3. If not see %(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\ cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\ - %(cc1_options) %2 %{+e1*}\ + %(cc1_options) %2\ %{!fsyntax-only:%(invoke_as)}}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, {".ii", "@c++-cpp-output", 0, 0, 0}, {"@c++-cpp-output", "%{!M:%{!MM:%{!E:\ - cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\ + cc1plus -fpreprocessed %i %(cc1_options) %2\ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, diff --git a/gcc/gcc.c b/gcc/gcc.c index 03cfedc9a7b..6f846d7f896 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -1475,7 +1475,7 @@ translate_options (int *argcp, const char *const **argvp) } } else - /* Ordinary operands, or +e options. */ + /* Ordinary operands. */ newv[newindex++] = argv[i++]; } @@ -3895,9 +3895,6 @@ process_command (int argc, const char **argv) /* Record the part after the last comma. */ add_preprocessor_option (argv[i] + prev, j - prev); } - else if (argv[i][0] == '+' && argv[i][1] == 'e') - /* The +e options to the C++ front-end. */ - n_switches++; else if (strncmp (argv[i], "-Wl,", 4) == 0) { int j; @@ -4356,19 +4353,6 @@ process_command (int argc, const char **argv) target_system_root = argv[i] + strlen ("--sysroot="); target_system_root_changed = 1; } - else if (argv[i][0] == '+' && argv[i][1] == 'e') - { - /* Compensate for the +e options to the C++ front-end; - they're there simply for cfront call-compatibility. We do - some magic in default_compilers to pass them down properly. - Note we deliberately start at the `+' here, to avoid passing - -e0 or -e1 down into the linker. */ - switches[n_switches].part1 = &argv[i][0]; - switches[n_switches].args = 0; - switches[n_switches].live_cond = 0; - switches[n_switches].validated = 0; - n_switches++; - } else if (strncmp (argv[i], "-Wl,", 4) == 0) { int prev, j; diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index 70731e13c21..cfb27f413cd 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,7 @@ +2010-06-25 Joseph Myers + + * lang-specs.h: Remove +e handling. + 2010-06-08 Laurynas Biveinis * objcp-decl.h (ALLOC_OBJC_TYPE_LANG_SPECIFIC): Use typed GC diff --git a/gcc/objcp/lang-specs.h b/gcc/objcp/lang-specs.h index ec8cfee42a4..1644e5a3047 100644 --- a/gcc/objcp/lang-specs.h +++ b/gcc/objcp/lang-specs.h @@ -1,5 +1,5 @@ /* Definitions for specs for Objective-C++. - Copyright (C) 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc. Contributed by Ziemowit Laski This file is part of GCC. @@ -36,7 +36,7 @@ along with GCC; see the file COPYING3. If not see %(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\ cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\ - %(cc1_options) %2 %{+e1*}\ + %(cc1_options) %2\ -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, {"@objective-c++", @@ -46,15 +46,15 @@ along with GCC; see the file COPYING3. If not see %(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\ cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\ %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\ - %(cc1_options) %2 %{+e1*}\ + %(cc1_options) %2\ %{!fsyntax-only:%(invoke_as)}}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, {".mii", "@objective-c++-cpp-output", 0, 0, 0}, {"@objective-c++-cpp-output", "%{!M:%{!MM:%{!E:\ - cc1objplus -fpreprocessed %i %(cc1_options) %2 %{+e*}\ + cc1objplus -fpreprocessed %i %(cc1_options) %2\ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, {"@objc++-cpp-output", "%{!M:%{!MM:%{!E:\ - cc1objplus -fpreprocessed %i %(cc1_options) %2 %{+e*}\ + cc1objplus -fpreprocessed %i %(cc1_options) %2\ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},