2008-01-09 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libcsupport/src/__assert.c: Newlib 1.16.0 adds __assert_func(). We
	need to have it also.

1 files changed, 31 insertions, 4 deletions

diff --git a/cpukit/libcsupport/src/__assert.c b/cpukit/libcsupport/src/__assert.c
index f6da15f2c9..3a93d32ed7 100644
--- a/cpukit/libcsupport/src/__assert.c
+++ b/cpukit/libcsupport/src/__assert.c
@@ -17,9 +17,36 @@
 #include <rtems/bspIo.h>
 #include <rtems.h>
 
-void __assert(const char *file, int line, const char *failedexpr)
+void __assert(
+  const char *file,
+  int         line,
+  
+const char *failedexpr)
 {
-    printk("assertion \"%s\" failed: file \"%s\", line %d\n",
-               failedexpr, file, line);
-    rtems_fatal_error_occurred(0);
+  printk(
+    "assertion \"%s\" failed: file \"%s\", line %d\n",
+    failedexpr,
+    file,
+    line
+   );
+   rtems_fatal_error_occurred(0);
+}
+
+/*
+ * Newlib 1.16.0 added this method
+ */
+void __assert_func(
+  const char *file,
+  int         line,
+  const char *func,
+  const char *failedexpr
+)
+{
+  printk("assertion \"%s\" failed: file \"%s\", line %d%s%s\n",
+    failedexpr,
+    file,
+    line,
+    func ? ", function: " : "", func ? func : ""
+  );
+  rtems_fatal_error_occurred(0);
 }