diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 392ab2c571db..0d8c24ca936e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-15  Steve Ellcey  <sellcey@imgtec.com>
+
+	* include/ext/random.tcc: Use __builtin_isfinite instead of
+	std::isfinite.
+
 2016-01-15  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/bits/std_mutex.h: Fix Doxygen @file name.
diff --git a/libstdc++-v3/include/ext/random.tcc b/libstdc++-v3/include/ext/random.tcc
index a9c5a2ba4d2e..52350e87314b 100644
--- a/libstdc++-v3/include/ext/random.tcc
+++ b/libstdc++-v3/include/ext/random.tcc
@@ -1570,7 +1570,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 			      return __t; });
 	      __norm = std::sqrt(__sum);
 	    }
-	  while (__norm == _RealType(0) || ! std::isfinite(__norm));
+	  while (__norm == _RealType(0) || ! __builtin_isfinite(__norm));
 
 	  std::transform(__ret.begin(), __ret.end(), __ret.begin(),
 			 [__norm](_RealType __val){ return __val / __norm; });