�

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: r18499

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index fad11838780c76cbd5e0445ea18a92360e9e2ce9..53c08b03b197df23c5410e5d64cea18de6274eca 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -1924,10 +1924,11 @@ while (0)
     if (GET_MODE (XEXP (X, 0)) == DImode)                              \
       {                                                                        \
        if (GET_CODE (XEXP (X, 1)) == CONST_INT)                        \
-         if (INTVAL (XEXP (X, 1)) > 32)                                        \
-           return COSTS_N_INSNS(ix86_cost->shift_const + 2);           \
-         else                                                          \
+         {                                                             \
+           if (INTVAL (XEXP (X, 1)) > 32)                              \
+             return COSTS_N_INSNS(ix86_cost->shift_const + 2);         \
            return COSTS_N_INSNS(ix86_cost->shift_const * 2);           \
+         }                                                             \
        return ((GET_CODE (XEXP (X, 1)) == AND                          \
                 ? COSTS_N_INSNS(ix86_cost->shift_var * 2)              \
                 : COSTS_N_INSNS(ix86_cost->shift_var * 6 + 2))         \
@@ -2332,10 +2333,10 @@ extern struct rtx_def *(*i386_compare_gen)(), *(*i386_compare_gen_eq)();
 /* Table of additional register names to use in user input.  */
 
 #define ADDITIONAL_REGISTER_NAMES \
-{ "eax", 0, "edx", 1, "ecx", 2, "ebx", 3,      \
-  "esi", 4, "edi", 5, "ebp", 6, "esp", 7,      \
-  "al", 0, "dl", 1, "cl", 2, "bl", 3,          \
-  "ah", 0, "dh", 1, "ch", 2, "bh", 3 }
+{ { "eax", 0 }, { "edx", 1 }, { "ecx", 2 }, { "ebx", 3 },      \
+  { "esi", 4 }, { "edi", 5 }, { "ebp", 6 }, { "esp", 7 },      \
+  { "al", 0 }, { "dl", 1 }, { "cl", 2 }, { "bl", 3 },          \
+  { "ah", 0 }, { "dh", 1 }, { "ch", 2 }, { "bh", 3 } }
 
 /* Note we are omitting these since currently I don't know how
 to get gcc to use these, since they want the same but different