In gcc/objc/:

2010-11-23  Nicola Pero  <nicola.pero@meta-innovation.com>

        PR objc/24358
        * lang-specs.h: Added objective-c-cpp-output.  Mapped .mi to
        objective-c-cpp-output instead of objc-cpp-output.  Print a
        deprecation note every time objc-cpp-output is requested.

In gcc/objcp/:
2010-11-23  Nicola Pero  <nicola.pero@meta-innovation.com>

        PR objc/24358
        * lang-specs.h: Print a deprecation note every time
        objc++-cpp-output is requested.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167073 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 3f953ea..e5b453b 100644 (file)
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-23  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+       PR objc/24358
+       * lang-specs.h: Added objective-c-cpp-output.  Mapped .mi to
+       objective-c-cpp-output instead of objc-cpp-output.  Print a
+       deprecation note every time objc-cpp-output is requested.
+
 2010-11-22  Joseph Myers  <joseph@codesourcery.com>
 
        * objc-act.c (write_symbols): Don't declare here.

diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h
index 62ffb99..f6a8f38 100644 (file)
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
@@ -19,8 +19,8 @@ along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
 
-/* This is the contribution to the `default_compilers' array in gcc.c for
-   objc.  */
+/* This is the contribution to the `default_compilers' array in gcc.c
+   for objc.  */
 
   {".m", "@objective-c", 0, 0, 0},
   {"@objective-c",
@@ -34,10 +34,6 @@ along with GCC; see the file COPYING3.  If not see
        %{!save-temps:%{!no-integrated-cpp:\
            cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\
         %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-  {".mi", "@objc-cpp-output", 0, 0, 0},
-  {"@objc-cpp-output",
-     "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(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}\
           %(cpp_options) %(cpp_debug_options)}\
@@ -52,3 +48,11 @@ along with GCC; see the file COPYING3.  If not see
            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},
+  {".mi", "@objective-c-cpp-output", 0, 0, 0},
+  {"@objective-c-cpp-output",
+     "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
+                            %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+  {"@objc-cpp-output",
+      "%nobjc-cpp-output is deprecated; please use objective-c-cpp-output instead\n\
+       %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
+                            %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},

diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index d59aa26..12babc5 100644 (file)
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-23  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+       PR objc/24358
+       * lang-specs.h: Print a deprecation note every time
+       objc++-cpp-output is requested.
+
 2010-10-24  Nicola Pero  <nicola.pero@meta-innovation.com>
 
        * objcp-lang.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Do not define.

diff --git a/gcc/objcp/lang-specs.h b/gcc/objcp/lang-specs.h
index 1644e5a..90dc4a4 100644 (file)
--- a/gcc/objcp/lang-specs.h
+++ b/gcc/objcp/lang-specs.h
@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.  If not see
     cc1objplus -fpreprocessed %i %(cc1_options) %2\
     %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
   {"@objc++-cpp-output",
-   "%{!M:%{!MM:%{!E:\
+   "%nobjc++-cpp-output is deprecated; please use objective-c++-cpp-output instead\n\
+    %{!M:%{!MM:%{!E:\
     cc1objplus -fpreprocessed %i %(cc1_options) %2\
     %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},