wip! improve support for hermit

newlib/configure.host

@@ -595,8 +595,8 @@ case "${host}" in
 	syscall_dir=syscalls
 	;;
   *-*-hermit*)
-	newlib_cflags="${newlib_cflags} -DREENTRANT_SYSCALLS_PROVIDED -D__DYNAMIC_REENT__ -DSIGNAL_PROVIDED -DHAVE_NANOSLEEP -DMALLOC_PROVIDED"
-+	;;
+	newlib_cflags="${newlib_cflags} -DREENTRANT_SYSCALLS_PROVIDED -D__DYNAMIC_REENT__ -DHAVE_NANOSLEEP -DMALLOC_PROVIDED"
+  ;;
 # RTEMS supplies its own versions of some routines:
 #       malloc()            (reentrant version)
 #       exit()              RTEMS has a "global" reent to flush

newlib/libc/include/sys/_timespec.h

@@ -44,9 +44,12 @@ typedef	_TIME_T_	time_t;
 #define	_TIME_T_DECLARED
 #endif
 
+#if !defined(_TIMESPEC_DECLARED)
 struct timespec {
 	time_t	tv_sec;		/* seconds */
 	long	tv_nsec;	/* and nanoseconds */
 };
+#define _TIMESPEC_DECLARED
+#endif
 
 #endif /* !_SYS__TIMESPEC_H_ */

newlib/libc/include/sys/_types.h

@@ -189,8 +189,12 @@ typedef	_CLOCK_T_	__clock_t;
 typedef	_TIME_T_	__time_t;
 
 #ifndef __machine_clockid_t_defined
+#if defined(__hermit__)
+#define _CLOCKID_T_ 	int
+#else
 #define	_CLOCKID_T_ 	unsigned long
 #endif
+#endif
 
 typedef	_CLOCKID_T_	__clockid_t;
 

newlib/libc/include/sys/select.h

@@ -8,7 +8,7 @@
    includes the W32api winsock[2].h header must know what it is doing;
    it must not call the Cygwin select function.
 */
-# if !(defined (_WINSOCK_H) || defined(__hermit__) || defined (_WINSOCKAPI_) || defined (__USE_W32_SOCKETS))
+# if !(defined (_WINSOCK_H) || defined (_WINSOCKAPI_) || defined (__USE_W32_SOCKETS))
 
 #include <sys/cdefs.h>
 #include <sys/_sigset.h>

newlib/libc/include/sys/signal.h

@@ -210,6 +210,8 @@ int sigwait (const sigset_t *, int *);
 #define sigemptyset(what)   (*(what) = 0, 0)
 #define sigfillset(what)    (*(what) = ~(0), 0)
 #define sigismember(what,sig) (((*(what)) & (1<<(sig))) != 0)
+#define sigorset(dst, sig1, sig2) (*(dst) = (*(sig1) | *(sig2)), 0)
+#define sigandset(dst, sig1, sig2) (*(dst) = (*(sig1) & *(sig2)), 0)
 #endif /* !__CYGWIN__ && !__rtems__ */
 #endif /* __POSIX_VISIBLE */
 

newlib/libc/include/sys/stat.h

@@ -23,6 +23,8 @@ extern "C" {
 #ifdef _LIBC
 #define stat64 stat
 #endif
+#elif defined(__hermit__)
+#include <hermit/stat.h>
 #else
 struct	stat 
 {
@@ -142,7 +144,7 @@ int	mkfifo (const char *__path, mode_t __mode );
 int	stat (const char *__restrict __path, struct stat *__restrict __sbuf );
 mode_t	umask (mode_t __mask );
 
-#if defined (__SPU__) || defined(__rtems__) || defined(__CYGWIN__)
+#if defined (__SPU__) || defined(__rtems__) || defined(__CYGWIN__) || defined(__hermit__)
 int	lstat (const char *__restrict __path, struct stat *__restrict __buf );
 int	mknod (const char *__path, mode_t __mode, dev_t __dev );
 #endif

newlib/libc/sys/hermit/Makefile.inc

@@ -1,38 +1,22 @@
 libc_a_SOURCES += \
-  %D%/chown.c \
-  %D%/clock_getres.c \
-  %D%/clock_gettime.c \
-  %D%/clock_nanosleep.c \
-  %D%/clock_settime.c \
-  %D%/close.c \
-  %D%/environ.c \
-  %D%/errno.c \
-  %D%/execve.c \
-  %D%/_exit.c \
-  %D%/fork.c \
-  %D%/fstat.c \
-  %D%/getpagesize.c \
-  %D%/getpid.c \
-  %D%/gettod.c \
-  %D%/isatty.c \
-  %D%/kill.c \
-  %D%/link.c \
-  %D%/lseek.c \
-  %D%/nanosleep.c \
-  %D%/open.c \
-  %D%/read.c \
-  %D%/readlink.c \
+  %D%/signal/kill.c \
+  %D%/signal/sigaction.c \
+  %D%/signal/sigprocmask.c \
+  %D%/signal/sigtimedwait.c \
+  %D%/stdio/rename.c \
+  %D%/conf.c \
+  %D%/dirent.c \
+  %D%/env.c \
+  %D%/fcntl.c \
+  %D%/ldso.c \
+  %D%/malloc.c \
+  %D%/misc.c \
+  %D%/mman.c \
+  %D%/network.c \
+  %D%/process.c \
   %D%/sbrk.c \
   %D%/sched.c \
-  %D%/setitimer.c \
-  %D%/signal.c \
+  %D%/select.c \
   %D%/stat.c \
-  %D%/symlink.c \
-  %D%/sysconf.c \
-  %D%/times.c \
-  %D%/unlink.c \
-  %D%/wait.c \
-  %D%/write.c \
-  %D%/context.S \
-  %D%/makecontext.c \
-  %D%/inet_ntoa.c
+  %D%/time.c \
+  %D%/unistd.c

newlib/libc/sys/hermit/README.md

@@ -0,0 +1,9 @@
+# Hermit Newlib Port
+
+This directory contains all the system dependent code for the Hermit Newlib port.
+
+For the syscalls, see `syscall.h` in `include/hermit`. 
+
+The port is based on some of Musl's libc files. The files are copied from the Musl libc 
+repository and modified to work with Newlib. All original files are referenced in the header 
+of the file.