From: Joel Sherrill <joel@rtems.org>
To: newlib@sourceware.org
Cc: Joel Sherrill <joel@rtems.org>
Subject: [PATCH 2/2] newlib/.../getreent.c: Allow to be provided by host and do so for RTEMS
Date: Tue, 10 Oct 2017 14:37:00 -0000 [thread overview]
Message-ID: <1507646169-24694-3-git-send-email-joel@rtems.org> (raw)
In-Reply-To: <1507646169-24694-1-git-send-email-joel@rtems.org>
RTEMS provides the option to have a global or per-thread reentrancy
as part of application configuration. As part of this, RTEMS provides
the implementation of __getreent() as appropriate. Allow the target
to determine if this method is present in libc.a.
---
newlib/configure.host | 4 +++-
newlib/libc/reent/getreent.c | 8 ++++++++
newlib/libc/sys/rtems/crt0.c | 3 +++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/newlib/configure.host b/newlib/configure.host
index fb3362b..f2049f4 100644
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -605,9 +605,11 @@ case "${host}" in
default_newlib_io_long_long="yes"
default_newlib_io_c99_formats="yes"
newlib_cflags="${newlib_cflags} -D_COMPILING_NEWLIB"
- newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVIDED -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_NANOSLEEP -DHAVE_BLKSIZE -DHAVE_FCNTL -DHAVE_ASSERT_FUNC"
+ newlib_cflags="${newlib_cflags} -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DEXIT_PROVIDED -DSIGNAL_PROVIDED -DGETREENT_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 -D_NO_POSIX_SPAWN"
+ # turn off using cli/sti in i386 setjmp/longjmp
+ newlib_cflags="${newlib_cflags} -D_I386MACH_ALLOW_HW_INTERRUPTS"
;;
# VxWorks supplies its own version of malloc, and the newlib one
# doesn't work because VxWorks does not have sbrk.
diff --git a/newlib/libc/reent/getreent.c b/newlib/libc/reent/getreent.c
index 60ae6fb..124abce 100644
--- a/newlib/libc/reent/getreent.c
+++ b/newlib/libc/reent/getreent.c
@@ -1,5 +1,11 @@
/* default reentrant pointer when multithread enabled */
+#ifdef GETREENT_PROVIDED
+
+int _dummy_getreent;
+
+#else
+
#include <_ansi.h>
#include <reent.h>
@@ -12,3 +18,5 @@ _DEFUN_VOID(__getreent)
{
return _impure_ptr;
}
+
+#endif
diff --git a/newlib/libc/sys/rtems/crt0.c b/newlib/libc/sys/rtems/crt0.c
index 0e9d426..4e2c207 100644
--- a/newlib/libc/sys/rtems/crt0.c
+++ b/newlib/libc/sys/rtems/crt0.c
@@ -125,6 +125,9 @@ RTEMS_STUB(int, waitpid (pid_t pid, int *status, int options), { return -1; })
#endif
RTEMS_STUB(_ssize_t, write (int fd, const void *buf, size_t nbytes), { return -1; })
+/* stubs for functions from sys/reent.h */
+RTEMS_STUB(struct _reent *, __getreent (), { })
+
/* stubs for functions from reent.h */
RTEMS_STUB(int, _close_r (struct _reent *r, int fd), { return -1; })
#if defined(_NO_EXECVE)
--
1.8.3.1
next prev parent reply other threads:[~2017-10-10 14:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-10 14:36 [PATCH 1/2] newlib/configure.host: Remove obsolete definition of _I386MACH_ALLOW_HW_INTERRUPTS Joel Sherrill
2017-10-10 14:36 ` [PATCH] newlib/MAINTAINERS: Add OS maintainers section and myself for RTEMS and Write After Approval Joel Sherrill
2017-10-11 10:53 ` Joel Sherrill
2017-10-10 14:37 ` Joel Sherrill [this message]
2017-10-11 12:05 ` [PATCH 2/2] newlib/.../getreent.c: Allow to be provided by host and do so for RTEMS Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507646169-24694-3-git-send-email-joel@rtems.org \
--to=joel@rtems.org \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).