Archival checkin of partially building minix68k plat. I don't think

porting the old minixST code is going to work here, and it needs a whole
new set of headers.

lang/cem/libcc.ansi/core/misc/raise.c

@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <unistd.h>
 
 #if ACKCONF_WANT_EMULATED_RAISE
 

lang/cem/libcc.ansi/headers/ack/config.h

@@ -23,6 +23,10 @@
 #define ACKCONF_WANT_STANDARD_SIGNALS 1
 #endif
 
+#ifndef ACKCONF_WANT_SYS_ERRNO_H
+#define ACKCONF_WANT_SYS_ERRNO_H 0
+#endif
+
 #ifndef ACKCONF_WANT_TERMIOS
 /* Don't compile termios-using functions unless the plat explicitly asks for it. */
 #define ACKCONF_WANT_TERMIOS 0

lang/cem/libcc.ansi/headers/errno.h

@@ -6,6 +6,10 @@
 #ifndef _ERRNO_H
 #define	_ERRNO_H
 
+#if ACKCONF_WANT_SYS_ERRNO_H
+#include <sys/errno.h>
+#else
+
 /* These values are defined by the ANSI standard. */
 
 #define EDOM    33
@@ -51,3 +55,5 @@
 extern int errno;
 
 #endif
+
+#endif

lang/cem/libcc.ansi/sys/misc/sleep.c

@@ -18,7 +18,7 @@ alfun(int sig)
 	longjmp(setjmpbuf, 1);
 } /* used with sleep() below */
 
-void sleep(int n)
+unsigned int sleep(int n)
 {
 	/* sleep(n) pauses for 'n' seconds by scheduling an alarm interrupt. */
 	unsigned oldalarm = 0;
@@ -30,7 +30,7 @@ void sleep(int n)
 	{
 		signal(SIGALRM, oldsig);
 		alarm(oldalarm);
-		return;
+		return 0;
 	}
 	oldalarm = alarm(5000); /* Who cares how long, as long
 					 * as it is long enough

plat/minix/include/build.lua

@@ -0,0 +1,39 @@
+include("plat/build.lua")
+
+headermap = {}
+packagemap = {}
+
+local function addheader(h)
+	headermap[h] = "plat/minix/include/"..h
+	packagemap["$(PLATIND)/minix/include/"..h] = "plat/minix/include/"..h
+end
+
+addheader("unistd.h")
+addheader("ansi.h")
+addheader("minix/callnr.h")
+addheader("minix/const.h")
+addheader("minix/config.h")
+addheader("minix/type.h")
+addheader("minix/com.h")
+addheader("utime.h")
+addheader("sgtty.h")
+addheader("sys/types.h")
+addheader("sys/errno.h")
+addheader("sys/times.h")
+addheader("sys/stat.h")
+addheader("sys/wait.h")
+addheader("signal.h")
+addheader("limits.h")
+addheader("fcntl.h")
+addheader("time.h")
+addheader("lib.h")
+
+acklibrary {
+	name = "headers",
+	hdrs = headermap
+}
+
+installable {
+	name = "pkg",
+	map = packagemap
+}

lib/minix/include/fcntl.h → plat/minix/include/fcntl.h

@@ -10,6 +10,8 @@
 #ifndef _FCNTL_H
 #define _FCNTL_H
 
+#include <sys/types.h>
+
 /* These values are used for cmd in fcntl().  POSIX Table 6-1.  */
 #define F_DUPFD            0	/* duplicate file descriptor */
 #define F_GETFD	           1	/* get file descriptor flags */

lib/minix/include/signal.h → plat/minix/include/signal.h

@@ -6,6 +6,8 @@
 #ifndef _SIGNAL_H
 #define _SIGNAL_H
 
+#include <sys/types.h>
+
 /* Here are types that are closely associated with signal handling. */
 typedef int sig_atomic_t;
 
@@ -97,6 +99,7 @@ struct sigaction {
 
 /* Function Prototypes. */
 _PROTOTYPE( int raise, (int _sig)					);
+_PROTOTYPE( int kill, (pid_t _pid, int _sig)				);
 
 #ifdef _POSIX_SOURCE
 _PROTOTYPE( int kill, (pid_t _pid, int _sig)				);

lib/minix/include/errno.h → plat/minix/include/sys/errno.h

@@ -17,8 +17,8 @@
  * file is included in an ordinary user program, EPERM has the value ( 1).
  */
 
-#ifndef _ERRNO_H		/* check if <errno.h> is already included */
-#define _ERRNO_H		/* it is not included; note that fact */
+#ifndef _SYS_ERRNO_H		/* check if <errno.h> is already included */
+#define _SYS_ERRNO_H		/* it is not included; note that fact */
 
 /* Now define _SIGN as "" or "-" depending on _SYSTEM. */
 #ifdef _SYSTEM

lib/minix/include/sys/types.h → plat/minix/include/sys/types.h

@@ -7,15 +7,7 @@
 #ifndef _TYPES_H
 #define _TYPES_H
 
-/* The type size_t holds the result of the size_of operator.  This type is
- * 'unsigned int', in order to be compatible with the old library (f.i. the
- * argument of malloc was an unsigned int, and is now a size_t).  This means
- * that a 70K array can not be allocated.
- */
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef unsigned int size_t;	/* type returned by sizeof */
-#endif
+#include <stdint.h>
 
 #ifndef _TIME_T
 #define _TIME_T
@@ -41,7 +33,6 @@ typedef char	       gid_t;	/* group id */
 typedef unsigned short ino_t;	/* i-node number */
 typedef short	      mode_t;	/* mode number within an i-node */
 typedef char	     nlink_t;	/* number-of-links field within an i-node */
-typedef long	       off_t;	/* offsets within a file */
 typedef int	       pid_t;	/* type for pids (must be signed) */
 typedef short	       uid_t;	/* user id */
 typedef long	      zone_t;	/* holds a zone number */

lib/minix/include/time.h → plat/minix/include/time.h

@@ -9,18 +9,14 @@
 #ifndef _TIME_H
 #define _TIME_H
 
+#include <sys/types.h>
+#include <stddef.h>
+
 #define CLOCKS_PER_SEC	60	/* MINIX always uses 60 Hz, even in Europe */
 #ifdef _POSIX_SOURCE
 #define CLK_TCK    	CLOCKS_PER_SEC
 #endif
 
-#define NULL    ((void *)0)
-
-#ifndef	_SIZE_T
-#define	_SIZE_T
-typedef unsigned int size_t;	/*  type returned by sizeof */
-#endif
-
 #ifndef _TIME_T
 #define _TIME_T
 typedef long time_t;		/* time in sec since 1 Jan 1970 0000 GMT */

lib/minix/include/unistd.h → plat/minix/include/unistd.h

@@ -3,6 +3,11 @@
 #ifndef _UNISTD_H
 #define _UNISTD_H
 
+#include <stddef.h>
+#include <sys/types.h>
+
+extern char** environ;
+
 /* Values used by access().  POSIX Table 2-6. */
 #define F_OK               0	/* test if file exists */
 #define X_OK               1	/* test if file is executable */
@@ -22,9 +27,6 @@
 #define STDOUT_FILENO      1	/* file descriptor for stdout */
 #define STDERR_FILENO      2	/* file descriptor for stderr */
 
-/* NULL must be defined in <unistd.h> according to POSIX Sec. 2.8.1. */
-#define NULL    ((void *)0)
-
 /* The following relate to configurable system variables. POSIX Table 4-2. */
 #define _SC_ARG_MAX		1
 #define _SC_CHILD_MAX		2
@@ -112,7 +114,6 @@ _PROTOTYPE( char *ttyname, (int _fd)					);
 _PROTOTYPE( int unlink, (const char *_path)				);
 _PROTOTYPE( int write, (int _fd, char *_buf, unsigned int _n)		);
 
-#ifdef _MINIX
 _PROTOTYPE( char *brk, (char *_addr)					);
 _PROTOTYPE( int mknod, (const char *_name, int _mode, int _addr)	);
 _PROTOTYPE( int mknod4, (const char *_name, int _mode, int _addr,
@@ -125,6 +126,5 @@ _PROTOTYPE( long ptrace, (int _req, int _pid, long _addr, long _data)	);
 _PROTOTYPE( int stime, (long *top)					);
 _PROTOTYPE( int sync, (void)						);
 _PROTOTYPE( int umount, (const char *_name)				);
-#endif
 
 #endif /* _UNISTD_H */