diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1ea25e418d4..943a538bc36 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-22  Nick Clifton  <nickc@redhat.com>
+
+	* config/stormy16/stormy16.c (xstormy16_init_builtins): prevent
+	initialisation of non-existant args[2] element.  Use args[] array
+	not arg[] array to pass arguments to build_function_type_list.
+
 2011-05-22  Ira Rosen  <ira.rosen@linaro.org>
 
 	PR tree-optimization/49087
diff --git a/gcc/config/stormy16/stormy16.c b/gcc/config/stormy16/stormy16.c
index 1a90e16da08..6edc2c1873b 100644
--- a/gcc/config/stormy16/stormy16.c
+++ b/gcc/config/stormy16/stormy16.c
@@ -2266,7 +2266,7 @@ xstormy16_init_builtins (void)
 
       gcc_assert (n_args <= (int) ARRAY_SIZE (args));
 
-      for (a = n_args; a >= 0; a--)
+      for (a = n_args - 1; a >= 0; a--)
 	args[a] = NULL_TREE;
 
       for (a = n_args; a >= 0; a--)
@@ -2284,9 +2284,9 @@ xstormy16_init_builtins (void)
 	  else
 	    args[a-1] = arg;
 	}
-      ftype = build_function_type_list (ret_type, arg[0], arg[1], NULL_TREE);
+      ftype = build_function_type_list (ret_type, args[0], args[1], NULL_TREE);
       add_builtin_function (s16builtins[i].name, ftype,
-			    i, BUILT_IN_MD, NULL, NULL);
+			    i, BUILT_IN_MD, NULL, NULL_TREE);
     }
 }
 
@@ -2407,7 +2407,8 @@ combine_bnp (rtx insn)
     {
       /* LT and GE conditionals should have a sign extend before
 	 them.  */
-      for (and_insn = prev_real_insn (insn); and_insn;
+      for (and_insn = prev_real_insn (insn);
+	   and_insn != NULL_RTX;
 	   and_insn = prev_real_insn (and_insn))
 	{
 	  int and_code = recog_memoized (and_insn);
@@ -2436,7 +2437,8 @@ combine_bnp (rtx insn)
   else
     {
       /* EQ and NE conditionals have an AND before them.  */
-      for (and_insn = prev_real_insn (insn); and_insn;
+      for (and_insn = prev_real_insn (insn);
+	   and_insn != NULL_RTX;
 	   and_insn = prev_real_insn (and_insn))
 	{
 	  if (recog_memoized (and_insn) == CODE_FOR_andhi3
@@ -2481,7 +2483,8 @@ combine_bnp (rtx insn)
 	    }
 	}
     }
-  if (!and_insn)
+
+  if (and_insn == NULL_RTX)
     return;
 
   for (load = shift ? prev_real_insn (shift) : prev_real_insn (and_insn);