diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 7b93e69d1..9eb10cc99 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-17  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/include/assert.h (__ASSERT_FUNC): Define to __FUNCTION__ when
+	__STDC_VERSION__ < 199901L and __GNUC__ >= 2.
+
 2008-07-17  Ken Werner  <ken.werner@de.ibm.com>
 
 	* libc/machine/spu/strcpy.h: Pad null bytes if necessary.
diff --git a/newlib/libc/include/assert.h b/newlib/libc/include/assert.h
index ed14928ba..e542b214f 100644
--- a/newlib/libc/include/assert.h
+++ b/newlib/libc/include/assert.h
@@ -21,10 +21,14 @@ extern "C" {
 #  if defined __cplusplus && defined __GNUC__
 #   define __ASSERT_FUNC __PRETTY_FUNCTION__
 
-  /* C99 requires the use of __func__, gcc also supports it.  */
-#  elif defined __GNUC__ || __STDC_VERSION__ >= 199901L
+  /* C99 requires the use of __func__.  */
+#  elif __STDC_VERSION__ >= 199901L
 #   define __ASSERT_FUNC __func__
 
+  /* Older versions of gcc don't have __func__ but can use __FUNCTION__.  */
+#  elif __GNUC__ >= 2
+#   define __ASSERT_FUNC __FUNCTION__
+
   /* failed to detect __func__ support.  */
 #  else
 #   define __ASSERT_FUNC ((char *) 0)