*** empty log message ***

From-SVN: r652

gcc/genattrtab.c

@@ -769,7 +769,7 @@ check_attr_value (exp, attr)
 	  for (p = XSTR (exp, 0); *p; p++)
 	    if (*p > '9' || *p < '0')
 	      fatal ("Non-numeric value for numeric `%s' attribute",
-		     attr ? "internal" : attr->name);
+		     attr ? attr->name : "internal");
 	  break;
 	}
 
@@ -780,7 +780,7 @@ check_attr_value (exp, attr)
 
       if (av == NULL)
 	fatal ("Unknown value `%s' for `%s' attribute",
-	       XSTR (exp, 0), attr ? "internal" : attr->name);
+	       XSTR (exp, 0), attr ? attr->name : "internal");
 
       return;
 

gcc/stor-layout.c

@@ -342,7 +342,8 @@ layout_record (rec)
 	  else
 	    {
 	      if (const_size > 0)
-		var_size = size_binop (PLUS_EXPR, var_size, const_size);
+		var_size = size_binop (PLUS_EXPR, var_size,
+				       size_int (const_size));
 	      const_size = 0;
 	      var_size = round_up (var_size, desired_align);
 	      var_align = MIN (var_align, desired_align);