/

In gcc/:
	* i386.h (RTX_COSTS): Insert braces around nested if.
	(ADDITIONAL_REGISTER_NAMES): Insert braces around structured
	elements.
	* gcc.c (default_compilers): Properly put brackets around array elements in
	initializer.
	* getopt.c (_getopt_internal): Add explicit braces around nested if;
	reformatted.
	* reg-stack.c (record_asm_reg_life): Add explicit braces around nested if's.
	(record_reg_life_pat): Add explicit parens around && and || in expression.
	(stack_reg_life_analysis): Add parens around assignment used as expression.
	(convert_regs): Likewise.
In gcc/cp/:
	* lang-specs.h: Properly put brackets around array elements in initializer.
	* typeck.c (build_binary_op_nodefault): Correctly place parens around
	&& and || in expression.
In gcc/f/:
	* lang-specs.h: Properly put brackets around array elements in initializer.

From-SVN: r18501

diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index 78a6956..55ff1fc 100644 (file)
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -21,14 +21,14 @@ Boston, MA 02111-1307, USA.  */
 /* This is the contribution to the `default_compilers' array in gcc.c for
    g++.  */
 
-  {".cc", "@c++"},
-  {".cp", "@c++"},
-  {".cxx", "@c++"},
-  {".cpp", "@c++"},
-  {".c++", "@c++"},
-  {".C", "@c++"},
+  {".cc", {"@c++"}},
+  {".cp", {"@c++"}},
+  {".cxx", {"@c++"}},
+  {".cpp", {"@c++"}},
+  {".c++", {"@c++"}},
+  {".C", {"@c++"}},
   {"@c++",
-   "cpp -lang-c++ %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
+   {"cpp -lang-c++ %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
        %{C:%{!E:%eGNU C++ does not support -C without using -E}}\
        %{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
        -undef -D__GNUC__=%v1 -D__GNUG__=%v1 -D__cplusplus -D__GNUC_MINOR__=%v2\
@@ -37,7 +37,7 @@ Boston, MA 02111-1307, USA.  */
         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}} %{trigraphs}\
        %{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %{!M:%{!MM:%{!E:%{!pipe:%g.ii}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
-   "%{!M:%{!MM:%{!E:cc1plus %{!pipe:%g.ii} %1 %2\
+    "%{!M:%{!MM:%{!E:cc1plus %{!pipe:%g.ii} %1 %2\
                            %{!Q:-quiet} -dumpbase %b.cc %{d*} %{m*} %{a}\
                            %{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi}\
                            %{v:-version} %{pg:-p} %{p}\
@@ -46,10 +46,10 @@ Boston, MA 02111-1307, USA.  */
                            %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}}|\n\
               %{!S:as %a %Y\
                      %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
-                      %{!pipe:%g.s} %A\n }}}}"},
-  {".ii", "@c++-cpp-output"},
+                      %{!pipe:%g.s} %A\n }}}}"}},
+  {".ii", {"@c++-cpp-output"}},
   {"@c++-cpp-output",
-   "%{!M:%{!MM:%{!E:cc1plus %i %1 %2 %{!Q:-quiet} %{d*} %{m*} %{a}\
+   {"%{!M:%{!MM:%{!E:cc1plus %i %1 %2 %{!Q:-quiet} %{d*} %{m*} %{a}\
                            %{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi}\
                            %{v:-version} %{pg:-p} %{p}\
                            %{f*} %{+e*} %{aux-info*}\
@@ -57,4 +57,4 @@ Boston, MA 02111-1307, USA.  */
                            %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
                    %{!S:as %a %Y\
                            %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
-                           %{!pipe:%g.s} %A\n }}}}"},
+                           %{!pipe:%g.s} %A\n }}}}"}},