2009-10-08 Jeff Johnston <jjohnstn@redhat.com>

        * configure.host: For RTEMS, define HAVE_ASSERT_FUNC.
        * libc/stdlib/assert.c (_assert_func): Do not specify
        __assert_func if HAVE_ASSERT_FUNC flag is set.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 483f3dc..cb1723b 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-08  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * configure.host: For RTEMS, define HAVE_ASSERT_FUNC.
+       * libc/stdlib/assert.c (_assert_func): Do not specify
+       __assert_func if HAVE_ASSERT_FUNC flag is set.
+
 2009-10-08  Eric Blake  <ebb9@byu.net>
 
        * libc/include/getopt.h (__getopt_r, __getopt_long_r)

diff --git a/newlib/configure.host b/newlib/configure.host
index 8576b65..50a5412 100644 (file)
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -549,7 +549,7 @@ case "${host}" in
   *-*-rtems*)
        default_newlib_io_long_long="yes"
        default_newlib_io_c99_formats="yes"
-       newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_BLKSIZE -DHAVE_FCNTL"
+       newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_BLKSIZE -DHAVE_FCNTL -DHAVE_ASSERT_FUNC"
         # turn off unsupported items in posix directory 
        newlib_cflags="${newlib_cflags} -D_NO_GETLOGIN -D_NO_GETPWENT -D_NO_GETUT -D_NO_GETPASS -D_NO_SIGSET -D_NO_WORDEXP -D_NO_POPEN"
        ;;

diff --git a/newlib/libc/stdlib/assert.c b/newlib/libc/stdlib/assert.c
index 2da3298..135bf15 100644 (file)
--- a/newlib/libc/stdlib/assert.c
+++ b/newlib/libc/stdlib/assert.c
@@ -47,6 +47,7 @@ Supporting OS subroutines required (only if enabled): <<close>>, <<fstat>>,
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifndef HAVE_ASSERT_FUNC
 /* func can be NULL, in which case no function information is given.  */
 void
 _DEFUN (__assert_func, (file, line, func, failedexpr),
@@ -62,6 +63,7 @@ _DEFUN (__assert_func, (file, line, func, failedexpr),
   abort();
   /* NOTREACHED */
 }
+#endif /* HAVE_ASSERT_FUNC */
 
 void
 _DEFUN (__assert, (file, line, failedexpr),