Merge pull request #70 from leo60228/nixos

Fix build on NixOS

gcc/c-typeck.c

@@ -3133,7 +3133,7 @@ build_unary_op (code, xarg, noconvert)
       return fold (build1 (code, argtype, arg));
     }
 
-  error (errstring);
+  error ("%s", errstring);
   return error_mark_node;
 }
 

gcc/real.c

@@ -4042,8 +4042,6 @@ mtherr (name, code)
      char *name;
      int code;
 {
-  char errstr[80];
-
   /* The string passed by the calling program is supposed to be the
      name of the function in which the error occurred.
      The code argument selects which error message string will be printed.  */
@@ -4066,9 +4064,8 @@ mtherr (name, code)
     name = "modulus";
   else if (strcmp (name, "esqrt") == 0)
     name = "square root";
-  sprintf (errstr, "%s during real %s", ermsg[code], name);
   if (extra_warnings)
-    warning (errstr);
+    warning ("%s during real %s", ermsg[code], name);
   /* Set global error message word */
   merror = code + 1;
 }

gcc/toplev.c

@@ -1061,7 +1061,7 @@ fatal_io_error(char *name)
 void
 fatal_insn(char *message, rtx insn)
 {
-    error(message);
+    error("%s", message);
     debug_rtx(insn);
     if (asm_out_file)
         fflush(asm_out_file);

gcc_arm/c-common.c

@@ -1587,7 +1587,7 @@ check_format_info (info, params)
 	      ++format_chars;
 	      if (params == 0)
 		{
-		  warning (tfaff);
+		  warning ("%s", tfaff);
 		  return;
 		}
 	      if (info->first_arg_num != 0)
@@ -1630,7 +1630,7 @@ check_format_info (info, params)
 		      ++format_chars;
 		      if (params == 0)
 		        {
-			  warning (tfaff);
+			  warning ("%s", tfaff);
 			  return;
 			}
 		      cur_param = TREE_VALUE (params);
@@ -1825,7 +1825,7 @@ check_format_info (info, params)
 	continue;
       if (params == 0)
 	{
-	  warning (tfaff);
+	  warning ("%s", tfaff);
 	  return;
 	}
       cur_param = TREE_VALUE (params);

gcc_arm/c-typeck.c

@@ -3147,7 +3147,7 @@ build_unary_op (code, xarg, noconvert)
       return fold (build1 (code, argtype, arg));
     }
 
-  error (errstring);
+  error ("%s", errstring);
   return error_mark_node;
 }
 

gcc_arm/cccp.c

@@ -8676,7 +8676,7 @@ macroexpand (hp, op)
       else
 	parse_error = macarg (NULL_PTR, 0);
       if (parse_error) {
-	error_with_line (line_for_error (start_line), parse_error);
+	error_with_line (line_for_error (start_line), "%s", parse_error);
 	break;
       }
       i++;

gcc_arm/real.c

@@ -5703,8 +5703,6 @@ mtherr (name, code)
      char *name;
      int code;
 {
-  char errstr[80];
-
   /* The string passed by the calling program is supposed to be the
      name of the function in which the error occurred.
      The code argument selects which error message string will be printed.  */
@@ -5727,9 +5725,8 @@ mtherr (name, code)
     name = "modulus";
   else if (strcmp (name, "esqrt") == 0)
     name = "square root";
-  sprintf (errstr, "%s during real %s", ermsg[code], name);
   if (extra_warnings)
-    warning (errstr);
+    warning ("%s during real %s", ermsg[code], name);
   /* Set global error message word */
   merror = code + 1;
 }

gcc_arm/toplev.c

@@ -1393,7 +1393,7 @@ fatal_insn (message, insn)
      char *message;
      rtx insn;
 {
-  error (message);
+  error ("%s", message);
   debug_rtx (insn);
   if (asm_out_file)
     fflush (asm_out_file);

libc/Makefile

@@ -15,7 +15,7 @@ export AR := $(PREFIX)ar
 export AS := $(PREFIX)as
 endif
 
-SHELL := /bin/bash -o pipefail
+SHELL := bash -o pipefail
 
 ASFLAGS := -mcpu=arm7tdmi