diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a564ac616e2a..af3dbb0cc9db 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-03  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* config/xtensa/xtensa.c (xtensa_init_builtins): Call
+	build_function_type_list instead of build_function_type.
+
 2011-05-03  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* config/iq2000/i2000.c (iq2000_init_builtins): Call
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index c312f50eca26..fe5798ec9ae6 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -3097,7 +3097,7 @@ xtensa_init_builtins (void)
 
   if (TARGET_THREADPTR)
     {
-      ftype = build_function_type (ptr_type_node, void_list_node);
+      ftype = build_function_type_list (ptr_type_node, NULL_TREE);
       decl = add_builtin_function ("__builtin_thread_pointer", ftype,
 				   XTENSA_BUILTIN_THREAD_POINTER, BUILT_IN_MD,
 				   NULL, NULL_TREE);