From 787a8c0feb104e6de4349c9485becd7292c2c9f7 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sun, 6 Mar 2011 16:27:57 +0000 Subject: [PATCH] lang-specs.h: Match -save-temps* instead of -save-temps. cp: * lang-specs.h: Match -save-temps* instead of -save-temps. objc: * lang-specs.h: Match -save-temps* instead of -save-temps. objcp * lang-specs.h: Match -save-temps* instead of -save-temps. From-SVN: r170715 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/lang-specs.h | 18 +++++++++--------- gcc/objc/ChangeLog | 4 ++++ gcc/objc/lang-specs.h | 12 ++++++------ gcc/objcp/ChangeLog | 4 ++++ gcc/objcp/lang-specs.h | 18 +++++++++--------- 6 files changed, 36 insertions(+), 24 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f69e55bf05c..3e228b0395c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2011-03-06 Joseph Myers + + * lang-specs.h: Match -save-temps* instead of -save-temps. + 2011-03-05 Jason Merrill * mangle.c (write_expression): Change ABI v6 to v5. diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h index 24213587f76..a73aba3cdc0 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, 2010 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2007, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -43,10 +43,10 @@ along with GCC; see the file COPYING3. If not see {"@c++-header", "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}\ %{!E:%{!M:%{!MM:\ - %{save-temps|no-integrated-cpp:cc1plus -E\ - %(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)}}\ + %{save-temps*|no-integrated-cpp:cc1plus -E\ + %(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\ %{!fsyntax-only:%{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\ %W{o*:--output-pch=%*}}%V}}}}", @@ -54,10 +54,10 @@ along with GCC; see the file COPYING3. If not see {"@c++", "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}\ %{!E:%{!M:%{!MM:\ - %{save-temps|no-integrated-cpp:cc1plus -E\ - %(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)}}\ + %{save-temps*|no-integrated-cpp:cc1plus -E\ + %(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\ %{!fsyntax-only:%(invoke_as)}}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index b547316d82e..5194347535c 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,7 @@ +2011-03-06 Joseph Myers + + * lang-specs.h: Match -save-temps* instead of -save-temps. + 2011-02-26 Nicola Pero * objc-act.c (objc_v2_encode_prop_attr): Rewritten. diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h index 70d9bba117b..8eac47b712f 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, 2010 + Copyright (C) 1998, 1999, 2002, 2002, 2003, 2005, 2007, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -29,9 +29,9 @@ along with GCC; see the file COPYING3. If not see %{!E:%{!M:%{!MM:\ %{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}}\ - %{!save-temps:%{!no-integrated-cpp:\ + %{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}}\ + %{!save-temps*:%{!no-integrated-cpp:\ cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\ %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, {"@objective-c-header", @@ -40,11 +40,11 @@ along with GCC; see the file COPYING3. If not see %{!E:%{!M:%{!MM:\ %{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\ + %{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}\ -o %g.s %{!o*:--output-pch=%i.gch}\ %W{o*:--output-pch=%*}%V}\ - %{!save-temps:%{!no-integrated-cpp:\ + %{!save-temps*:%{!no-integrated-cpp:\ cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\ -o %g.s %{!o*:--output-pch=%i.gch}\ %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0}, diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index 97d28f85440..c8d697c581d 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,7 @@ +2011-03-06 Joseph Myers + + * lang-specs.h: Match -save-temps* instead of -save-temps. + 2011-02-20 Nicola Pero PR objc++/47711 diff --git a/gcc/objcp/lang-specs.h b/gcc/objcp/lang-specs.h index 90dc4a41c4e..af21ff6d63f 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, 2010 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2010, 2011 Free Software Foundation, Inc. Contributed by Ziemowit Laski This file is part of GCC. @@ -32,20 +32,20 @@ along with GCC; see the file COPYING3. If not see {"@objective-c++-header", "%{E|M|MM:cc1objplus -E %(cpp_options) %2 %(cpp_debug_options)}\ %{!E:%{!M:%{!MM:\ - %{save-temps|no-integrated-cpp:cc1objplus -E\ - %(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)}}\ + %{save-temps*|no-integrated-cpp:cc1objplus -E\ + %(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\ -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, {"@objective-c++", "%{E|M|MM:cc1objplus -E %(cpp_options) %2 %(cpp_debug_options)}\ %{!E:%{!M:%{!MM:\ - %{save-temps|no-integrated-cpp:cc1objplus -E\ - %(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)}}\ + %{save-temps*|no-integrated-cpp:cc1objplus -E\ + %(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\ %{!fsyntax-only:%(invoke_as)}}}}", CPLUSPLUS_CPP_SPEC, 0, 0}, -- 2.30.2