RTEMS: Include missing header and fix stub

Message ID 20200313172136.10663-1-sebastian.huber@embedded-brains.de
State Accepted
Commit b37a3388cca2df92c204ab8693b09966dca2dad4
Headers show
Series
  • RTEMS: Include missing header and fix stub
Related show

Commit Message

Sebastian Huber March 13, 2020, 5:21 p.m.
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>

---
 newlib/libc/sys/rtems/crt0.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.16.4

Comments

Joel Sherrill March 13, 2020, 6:26 p.m. | #1
This is OK and RTEMS specific. I will push it.

--joel

On Fri, Mar 13, 2020 at 12:21 PM Sebastian Huber <
sebastian.huber@embedded-brains.de> wrote:

> Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>

> ---

>  newlib/libc/sys/rtems/crt0.c | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

>

> diff --git a/newlib/libc/sys/rtems/crt0.c b/newlib/libc/sys/rtems/crt0.c

> index 28db7132a..6b8b5f98f 100644

> --- a/newlib/libc/sys/rtems/crt0.c

> +++ b/newlib/libc/sys/rtems/crt0.c

> @@ -13,6 +13,7 @@

>  #include <sys/lock.h>

>  #include <sys/stat.h>

>  #include <sys/uio.h>

> +#include <assert.h>

>  #include <reent.h>

>  #include <signal.h>

>  #include <stdlib.h>

> @@ -194,7 +195,7 @@ RTEMS_STUB(void *, _malloc_r(struct _reent * r, size_t

> s), { return 0; })

>  RTEMS_STUB(void, _free_r(struct _reent *r, void *p), { })

>

>  /* stubs for functions required by libc/stdlib */

> -RTEMS_STUB(void, __assert_func(const char *file, int line, const char

> *failedexpr), { })

> +RTEMS_STUB(void, __assert_func(const char *file, int line, const char

> *func, const char *failedexpr), { })

>

>  #if defined(__arm__)

>  RTEMS_STUB(void, __aeabi_read_tp(void), { })

> --

> 2.16.4

>

>

Patch

diff --git a/newlib/libc/sys/rtems/crt0.c b/newlib/libc/sys/rtems/crt0.c
index 28db7132a..6b8b5f98f 100644
--- a/newlib/libc/sys/rtems/crt0.c
+++ b/newlib/libc/sys/rtems/crt0.c
@@ -13,6 +13,7 @@ 
 #include <sys/lock.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
+#include <assert.h>
 #include <reent.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -194,7 +195,7 @@  RTEMS_STUB(void *, _malloc_r(struct _reent * r, size_t s), { return 0; })
 RTEMS_STUB(void, _free_r(struct _reent *r, void *p), { })
 
 /* stubs for functions required by libc/stdlib */
-RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr), { })
+RTEMS_STUB(void, __assert_func(const char *file, int line, const char *func, const char *failedexpr), { })
 
 #if defined(__arm__)
 RTEMS_STUB(void, __aeabi_read_tp(void), { })