From: Zack Weinberg <zack@rabi.columbia.edu>
Date: Wed, 5 May 1999 07:02:04 +0000 (+0000)
Subject: gcc.c (default_compilers): Fix brace nesting bug.
X-Git-Tag: prereleases/gcc-2.95-test~630
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ba051d33eda5c331f6189ed57f814d46666c064;p=thirdparty%2Fgcc.git

gcc.c (default_compilers): Fix brace nesting bug.

1999-05-05 09:58 -0400  Zack Weinberg  <zack@rabi.columbia.edu>
	* gcc.c (default_compilers): Fix brace nesting bug.
	* objc/lang-specs.h: Use %i, not %g.mi, for the input file
	when processing an .mi file.

From-SVN: r26775
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fab7d58835d6..c343a1bc8d6c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+1999-05-05 09:58 -0400  Zack Weinberg  <zack@rabi.columbia.edu>
+
+	* gcc.c (default_compilers): Fix brace nesting bug.
+	* objc/lang-specs.h: Use %i, not %g.mi, for the input file
+	when processing an .mi file.
+
 Tue May  4 13:17:55 1999  Mark Mitchell  <mark@codesourcery.com>
 
 	* resource.c (mark_set_resources): Handle UNSPEC_VOLATILE,
diff --git a/gcc/gcc.c b/gcc/gcc.c
index cece9c57475f..8b21f6020ab9 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -629,7 +629,6 @@ static struct compiler default_compilers[] =
                   %{!S:as %a %Y\
 		     %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
                      %{!pipe:%g.s} %A\n }}}}"
-  }},
 #else /* ! USE_CPPLIB */
     "cpp -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\
 	%{C} %{v} %{A*} %{I*} %{P} %I\
@@ -656,8 +655,8 @@ static struct compiler default_compilers[] =
               %{!S:as %a %Y\
 		      %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
                       %{!pipe:%g.s} %A\n }}}}"
-  }},
 #endif /* ! USE_CPPLIB */
+  }},
   {"-",
    {"%{E:cpp -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\
 	%{C} %{v} %{A*} %{I*} %{P} %I\
diff --git a/gcc/objc/lang-specs.h b/gcc/objc/lang-specs.h
index b9e187005f10..55a509ee6407 100644
--- a/gcc/objc/lang-specs.h
+++ b/gcc/objc/lang-specs.h
@@ -83,7 +83,7 @@ Boston, MA 02111-1307, USA.  */
   },
   {".mi", {"@objc-cpp-output"}},
   {"@objc-cpp-output",
-   {"%{!M:%{!MM:%{!E:cc1obj %{!pipe:%g.i} %1 \
+   {"%{!M:%{!MM:%{!E:cc1obj %i %1 \
 		   %{!Q:-quiet} -dumpbase %b.m %{d*} %{m*} %{a*}\
 		   %{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi} \
 		   %{traditional} %{v:-version} %{pg:-p} %{p} %{f*} \