diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b2a30761e128d76aa75aabcb8f37bc4ace93256..3a3d6223aecfc322bfaa7f299eef0bff76c67f1b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-11  Ben Elliston  <bje@au.ibm.com>
+
+	* config/spu/spu.c (spu_init_builtins): Mark builtins as nothrow.
+
 2008-04-10  Rafael Espindola  <espindola@google.com>
 
 	* gcc/tree-vrp.c (extract_range_from_binary_expr): Don't handle
diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c
index 8096b6fe4fe34e70c29aa8da9d47635ab8d9e8a9..55868ac2bb9d036a6dd3b66f710c11894500491c 100644
--- a/gcc/config/spu/spu.c
+++ b/gcc/config/spu/spu.c
@@ -4518,10 +4518,9 @@ spu_init_builtins (void)
       if (d->name == 0)
 	continue;
 
-      /* find last parm */
+      /* Find last parm.  */
       for (parm = 1; d->parm[parm] != SPU_BTI_END_OF_PARAMS; parm++)
-	{
-	}
+	;
 
       p = void_list_node;
       while (parm > 1)
@@ -4535,6 +4534,9 @@ spu_init_builtins (void)
 			      NULL, NULL_TREE);
       if (d->fcode == SPU_MASK_FOR_LOAD)
 	TREE_READONLY (d->fndecl) = 1;	
+
+      /* These builtins don't throw.  */
+      TREE_NOTHROW (d->fndecl) = 1;
     }
 }