diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af3dbb0cc9dbdf835eea4868a544378dda0cd732..1b787ecb84ce7523afc8d3bd6cc40b6c0d99cc6c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-03  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* config/alpha/alpha.c (alpha_init_builtins): Call
+	build_function_type_list instead of build_function_type.
+
 2011-05-03  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* config/xtensa/xtensa.c (xtensa_init_builtins): Call
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 72ade3ef2d1f883627aca0b6ed3a1d5080252d6a..99ebf62d24228baedee8cd9af1424f06b8098de4 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -6408,7 +6408,7 @@ alpha_init_builtins (void)
   implicit_built_in_decls[(int) BUILT_IN_FWRITE_UNLOCKED] = NULL_TREE;
 #endif
 
-  ftype = build_function_type (dimode_integer_type_node, void_list_node);
+  ftype = build_function_type_list (dimode_integer_type_node, NULL_TREE);
   alpha_add_builtins (zero_arg_builtins, ARRAY_SIZE (zero_arg_builtins),
 		      ftype);
 
@@ -6423,7 +6423,7 @@ alpha_init_builtins (void)
   alpha_add_builtins (two_arg_builtins, ARRAY_SIZE (two_arg_builtins),
 		      ftype);
 
-  ftype = build_function_type (ptr_type_node, void_list_node);
+  ftype = build_function_type_list (ptr_type_node, NULL_TREE);
   alpha_builtin_function ("__builtin_thread_pointer", ftype,
 			  ALPHA_BUILTIN_THREAD_POINTER, ECF_NOTHROW);