diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e8549dbd0d..000bc5f8f5e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-07  Ben Elliston  <bje@au.ibm.com>
+
+	* libgcc2.c (INFINITY): Use __builtin_huge_val, not __builtin_inf,
+	as the latter produces a warning when the target does not support
+	infinity.
+
 2009-04-07  Ben Elliston  <bje@au.ibm.com>
 
 	* dfp.c: Replace type punning assignments with memcpy throughout.
diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index 369c29f6abf..f6e74656bc6 100644
--- a/gcc/libgcc2.c
+++ b/gcc/libgcc2.c
@@ -1807,7 +1807,7 @@ NAME (TYPE x, int m)
 #define isfinite(x)	__builtin_expect (!isnan((x) - (x)), 1)
 #define isinf(x)	__builtin_expect (!isnan(x) & !isfinite(x), 0)
 
-#define INFINITY	CONCAT2(__builtin_inf, CEXT) ()
+#define INFINITY	CONCAT2(__builtin_huge_val, CEXT) ()
 #define I		1i
 
 /* Helpers to make the following code slightly less gross.  */