summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-31 16:33:48 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-10-31 16:33:48 +0000
commit781262bb5bd6f109e17e2c9a8515f1bb394f37c6 (patch)
tree2f29edc50e7a385213e266b3521bf6137a64db0d
parentc51af96e04be9ad4d54a9c96276d4c59e41fa0f6 (diff)
downloadrtems-781262bb5bd6f109e17e2c9a8515f1bb394f37c6.tar.bz2
2000-10-30 Joel Sherrill <joel@OARcorp.com>
* include/Makefile.am: Updated to reflect files merged into newlib. This resulted in some definitions moving to other files and thus some secondary effects in RTEMS source code. * include/unistd.h: Removed. Now use newlib's. * include/rtems/posix/mqueue.h: Add include of <signal.h>. * include/rtems/posix/threadsup.h: Add include of <sys/signal.h> * src/execv.c: Corrected prototype to agree with newlib. * src/execve.c: Corrected prototype to agree with newlib. * src/execvp.c: Corrected prototype to agree with newlib. * src/psignal.c: Rewrote reference to <siginfo.h> in comment since that file no longer exists. * src/pthreadkill.c: Added include of <signal.h>. * src/sigaction.c: Added include of <signal.h>. * src/sigtimedwait.c: Rewrote reference to <siginfo.h> in comment since that file no longer exists. *
-rw-r--r--c/src/exec/posix/ChangeLog18
-rw-r--r--c/src/exec/posix/include/Makefile.am3
-rw-r--r--c/src/exec/posix/include/rtems/posix/mqueue.h2
-rw-r--r--c/src/exec/posix/include/rtems/posix/threadsup.h1
-rw-r--r--c/src/exec/posix/include/unistd.h97
-rw-r--r--c/src/exec/posix/src/execv.c3
-rw-r--r--c/src/exec/posix/src/execve.c3
-rw-r--r--c/src/exec/posix/src/execvp.c2
-rw-r--r--c/src/exec/posix/src/psignal.c2
-rw-r--r--c/src/exec/posix/src/pthreadkill.c1
-rw-r--r--c/src/exec/posix/src/sigaction.c1
-rw-r--r--c/src/exec/posix/src/sigtimedwait.c2
-rw-r--r--cpukit/posix/ChangeLog18
-rw-r--r--cpukit/posix/include/Makefile.am3
-rw-r--r--cpukit/posix/include/rtems/posix/mqueue.h2
-rw-r--r--cpukit/posix/include/rtems/posix/threadsup.h1
-rw-r--r--cpukit/posix/src/execv.c3
-rw-r--r--cpukit/posix/src/execve.c3
-rw-r--r--cpukit/posix/src/execvp.c2
-rw-r--r--cpukit/posix/src/psignal.c2
-rw-r--r--cpukit/posix/src/pthreadkill.c1
-rw-r--r--cpukit/posix/src/sigaction.c1
-rw-r--r--cpukit/posix/src/sigtimedwait.c2
23 files changed, 56 insertions, 117 deletions
diff --git a/c/src/exec/posix/ChangeLog b/c/src/exec/posix/ChangeLog
index 26b1fe5578..50bf38f01c 100644
--- a/c/src/exec/posix/ChangeLog
+++ b/c/src/exec/posix/ChangeLog
@@ -1,3 +1,21 @@
+2000-10-30 Joel Sherrill <joel@OARcorp.com>
+
+ * include/Makefile.am: Updated to reflect files merged into newlib.
+ This resulted in some definitions moving to other files and thus
+ some secondary effects in RTEMS source code.
+ * include/unistd.h: Removed. Now use newlib's.
+ * include/rtems/posix/mqueue.h: Add include of <signal.h>.
+ * include/rtems/posix/threadsup.h: Add include of <sys/signal.h>
+ * src/execv.c: Corrected prototype to agree with newlib.
+ * src/execve.c: Corrected prototype to agree with newlib.
+ * src/execvp.c: Corrected prototype to agree with newlib.
+ * src/psignal.c: Rewrote reference to <siginfo.h> in comment since
+ that file no longer exists.
+ * src/pthreadkill.c: Added include of <signal.h>.
+ * src/sigaction.c: Added include of <signal.h>.
+ * src/sigtimedwait.c: Rewrote reference to <siginfo.h> in comment since
+ that file no longer exists.
+
2000-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
diff --git a/c/src/exec/posix/include/Makefile.am b/c/src/exec/posix/include/Makefile.am
index 387e599641..16db0edd0d 100644
--- a/c/src/exec/posix/include/Makefile.am
+++ b/c/src/exec/posix/include/Makefile.am
@@ -4,8 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
-## RTEMS unistd.h needs to be checked against newlib's and removed
-UNUSED_H_FILES = devctl.h intr.h unistd.h
+UNUSED_H_FILES = devctl.h intr.h
H_FILES = sched.h aio.h mqueue.h semaphore.h
diff --git a/c/src/exec/posix/include/rtems/posix/mqueue.h b/c/src/exec/posix/include/rtems/posix/mqueue.h
index e3f7a2f073..6b2cb9e464 100644
--- a/c/src/exec/posix/include/rtems/posix/mqueue.h
+++ b/c/src/exec/posix/include/rtems/posix/mqueue.h
@@ -20,7 +20,7 @@
extern "C" {
#endif
-#include <sys/siginfo.h>
+#include <signal.h>
#include <rtems/score/coremsg.h>
#include <rtems/score/object.h>
diff --git a/c/src/exec/posix/include/rtems/posix/threadsup.h b/c/src/exec/posix/include/rtems/posix/threadsup.h
index ee93f8252c..2ffc606911 100644
--- a/c/src/exec/posix/include/rtems/posix/threadsup.h
+++ b/c/src/exec/posix/include/rtems/posix/threadsup.h
@@ -6,6 +6,7 @@
#ifndef __RTEMS_POSIX_THREAD_SUPPORT_h
#define __RTEMS_POSIX_THREAD_SUPPORT_h
+#include <sys/signal.h>
#include <rtems/score/coresem.h>
#include <rtems/score/tqdata.h>
diff --git a/c/src/exec/posix/include/unistd.h b/c/src/exec/posix/include/unistd.h
deleted file mode 100644
index 207fe14fd0..0000000000
--- a/c/src/exec/posix/include/unistd.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* unistd.h
- *
- * $Id$
- */
-
-#ifndef __POSIX_UNISTD_h
-#define __POSIX_UNISTD_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/features.h>
-
-/*
- * 4.8.1 Get Configurable System Variables, P1003.1b-1993, p. 96
- *
- * NOTE: Table 4-2, Configurable System Variables, p. 96
- */
-
-#define _SC_AIO_LISTIO_MAX 0
-#define _SC_AIO_MAX 1
-#define _SC_AIO_PRIO_DELTA_MAX 2
-#define _SC_ARG_MAX 3
-#define _SC_CHILD_MAX 4
-#define _SC_CLK_TCK 5
-#define _SC_DELAYTIMER_MAX 6
-#define _SC_MQ_OPEN_MAX 7
-#define _SC_MQ_PRIO_MAX 8
-#define _SC_NGROUPS_MAX 9
-#define _SC_OPEN_MAX 10
-#define _SC_PAGESIZE 11
-#define _SC_RTSIG_MAX 12
-#define _SC_SEM_NSEMS_MAX 13
-#define _SC_SEM_VALUE_MAX 14
-#define _SC_SIGQUEUE_MAX 15
-#define _SC_STREAM_MAX 16
-#define _SC_TIMER_MAX 17
-#define _SC_TZNAME_MAX 18
-
-#define _SC_ASYNCHRONOUS_IO 19
-#define _SC_FSYNC 20
-#define _SC_JOB_CONTROL 21
-#define _SC_MAPPED_FILES 22
-#define _SC_MEMLOCK 23
-#define _SC_MEMLOCK_RANGE 24
-#define _SC_MEMORY_PROTECTION 25
-#define _SC_MESSAGE_PASSING 26
-#define _SC_PRIORITIZED_IO 27
-#define _SC_REALTIME_SIGNALS 28
-#define _SC_SAVED_IDS 29
-#define _SC_SEMAPHORES 30
-#define _SC_SHARED_MEMORY_OBJECTS 31
-#define _SC_SYNCHRONIZED_IO 32
-#define _SC_TIMERS 33
-#define _SC_VERSION 34
-
-/*
- * P1003.1c/D10, p. 52 adds the following.
- */
-
-#define _SC_GETGR_R_SIZE_MAX 35
-#define _SC_GETPW_R_SIZE_MAX 36
-#define _SC_LOGIN_NAME_MAX 37
-#define _SC_THREAD_DESTRUCTOR_ITERATIONS 38
-#define _SC_THREAD_KEYS_MAX 39
-#define _SC_THREAD_STACK_MIN 40
-#define _SC_THREAD_THREADS_MAX 41
-#define _SC_TTY_NAME_MAX 42
-
-#define _SC_THREADS 43
-#define _SC_THREAD_ATTR_STACKADDR 44
-#define _SC_THREAD_ATTR_STACKSIZE 45
-#define _SC_THREAD_PRIORITY_SCHEDULING 46
-#define _SC_THREAD_PRIO_INHERIT 47
-#define _SC_THREAD_PRIO_CEILING 48
-#define _SC_THREAD_PROCESS_SHARED 49
-#define _SC_THREAD_SAFE_FUNCTIONS 50
-
-/* JRS: 04/02/98: _SC_THREAD_PRIO_CEILING seems to have changed names
- * in the final standard to _SC_THREAD_PRIO_PROTECT.
- */
-
-/*
- * 4.8.1 Get Configurable System Variables, P1003.1b-1993, p. 95
- */
-
-long sysconf(
- int name
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-/* end of include */
diff --git a/c/src/exec/posix/src/execv.c b/c/src/exec/posix/src/execv.c
index d05f4a2c58..3a2d41d107 100644
--- a/c/src/exec/posix/src/execv.c
+++ b/c/src/exec/posix/src/execv.c
@@ -8,8 +8,7 @@
int execv(
const char *file,
- char *const argv[],
- ...
+ char *const argv[]
)
{
errno = ENOSYS;
diff --git a/c/src/exec/posix/src/execve.c b/c/src/exec/posix/src/execve.c
index 478af706ea..ee3415b154 100644
--- a/c/src/exec/posix/src/execve.c
+++ b/c/src/exec/posix/src/execve.c
@@ -9,8 +9,7 @@
int execve(
const char *path,
char *const argv[],
- char *const envp[],
- ...
+ char *const envp[]
)
{
errno = ENOSYS;
diff --git a/c/src/exec/posix/src/execvp.c b/c/src/exec/posix/src/execvp.c
index a9d7694fbd..19f49fec58 100644
--- a/c/src/exec/posix/src/execvp.c
+++ b/c/src/exec/posix/src/execvp.c
@@ -8,7 +8,7 @@
int execvp(
const char *path,
- char const *argv[]
+ char *const argv[]
)
{
errno = ENOSYS;
diff --git a/c/src/exec/posix/src/psignal.c b/c/src/exec/posix/src/psignal.c
index 1df8def77d..07c2ad5b07 100644
--- a/c/src/exec/posix/src/psignal.c
+++ b/c/src/exec/posix/src/psignal.c
@@ -140,7 +140,7 @@ restart:
}
-/* XXX - add __SIGFIRSTNOTRT or something like that to newlib siginfo.h */
+/* XXX - add __SIGFIRSTNOTRT or something like that to newlib signal .h */
for ( signo = SIGHUP ; signo <= __SIGLASTNOTRT ; signo++ ) {
diff --git a/c/src/exec/posix/src/pthreadkill.c b/c/src/exec/posix/src/pthreadkill.c
index 37de5fc4c0..3b789fc8e7 100644
--- a/c/src/exec/posix/src/pthreadkill.c
+++ b/c/src/exec/posix/src/pthreadkill.c
@@ -13,6 +13,7 @@
#include <pthread.h>
+#include <signal.h>
#include <errno.h>
#include <rtems/system.h>
diff --git a/c/src/exec/posix/src/sigaction.c b/c/src/exec/posix/src/sigaction.c
index f7c525e002..aca5702329 100644
--- a/c/src/exec/posix/src/sigaction.c
+++ b/c/src/exec/posix/src/sigaction.c
@@ -13,6 +13,7 @@
#include <pthread.h>
+#include <signal.h>
#include <errno.h>
#include <rtems/system.h>
diff --git a/c/src/exec/posix/src/sigtimedwait.c b/c/src/exec/posix/src/sigtimedwait.c
index 3300b7383d..b87d9cbd3d 100644
--- a/c/src/exec/posix/src/sigtimedwait.c
+++ b/c/src/exec/posix/src/sigtimedwait.c
@@ -34,7 +34,7 @@ int _POSIX_signals_Get_highest(
return signo;
}
-/* XXX - add __SIGFIRSTNOTRT or something like that to newlib siginfo.h */
+/* XXX - add __SIGFIRSTNOTRT or something like that to newlib signal .h */
for ( signo = SIGHUP ; signo <= __SIGLASTNOTRT ; signo++ ) {
if ( set & signo_to_mask( signo ) )
diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index 26b1fe5578..50bf38f01c 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,21 @@
+2000-10-30 Joel Sherrill <joel@OARcorp.com>
+
+ * include/Makefile.am: Updated to reflect files merged into newlib.
+ This resulted in some definitions moving to other files and thus
+ some secondary effects in RTEMS source code.
+ * include/unistd.h: Removed. Now use newlib's.
+ * include/rtems/posix/mqueue.h: Add include of <signal.h>.
+ * include/rtems/posix/threadsup.h: Add include of <sys/signal.h>
+ * src/execv.c: Corrected prototype to agree with newlib.
+ * src/execve.c: Corrected prototype to agree with newlib.
+ * src/execvp.c: Corrected prototype to agree with newlib.
+ * src/psignal.c: Rewrote reference to <siginfo.h> in comment since
+ that file no longer exists.
+ * src/pthreadkill.c: Added include of <signal.h>.
+ * src/sigaction.c: Added include of <signal.h>.
+ * src/sigtimedwait.c: Rewrote reference to <siginfo.h> in comment since
+ that file no longer exists.
+
2000-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: ACLOCAL_AMFLAGS= -I $(RTEMS_TOPdir)/macros.
diff --git a/cpukit/posix/include/Makefile.am b/cpukit/posix/include/Makefile.am
index 387e599641..16db0edd0d 100644
--- a/cpukit/posix/include/Makefile.am
+++ b/cpukit/posix/include/Makefile.am
@@ -4,8 +4,7 @@
AUTOMAKE_OPTIONS = foreign 1.4
-## RTEMS unistd.h needs to be checked against newlib's and removed
-UNUSED_H_FILES = devctl.h intr.h unistd.h
+UNUSED_H_FILES = devctl.h intr.h
H_FILES = sched.h aio.h mqueue.h semaphore.h
diff --git a/cpukit/posix/include/rtems/posix/mqueue.h b/cpukit/posix/include/rtems/posix/mqueue.h
index e3f7a2f073..6b2cb9e464 100644
--- a/cpukit/posix/include/rtems/posix/mqueue.h
+++ b/cpukit/posix/include/rtems/posix/mqueue.h
@@ -20,7 +20,7 @@
extern "C" {
#endif
-#include <sys/siginfo.h>
+#include <signal.h>
#include <rtems/score/coremsg.h>
#include <rtems/score/object.h>
diff --git a/cpukit/posix/include/rtems/posix/threadsup.h b/cpukit/posix/include/rtems/posix/threadsup.h
index ee93f8252c..2ffc606911 100644
--- a/cpukit/posix/include/rtems/posix/threadsup.h
+++ b/cpukit/posix/include/rtems/posix/threadsup.h
@@ -6,6 +6,7 @@
#ifndef __RTEMS_POSIX_THREAD_SUPPORT_h
#define __RTEMS_POSIX_THREAD_SUPPORT_h
+#include <sys/signal.h>
#include <rtems/score/coresem.h>
#include <rtems/score/tqdata.h>
diff --git a/cpukit/posix/src/execv.c b/cpukit/posix/src/execv.c
index d05f4a2c58..3a2d41d107 100644
--- a/cpukit/posix/src/execv.c
+++ b/cpukit/posix/src/execv.c
@@ -8,8 +8,7 @@
int execv(
const char *file,
- char *const argv[],
- ...
+ char *const argv[]
)
{
errno = ENOSYS;
diff --git a/cpukit/posix/src/execve.c b/cpukit/posix/src/execve.c
index 478af706ea..ee3415b154 100644
--- a/cpukit/posix/src/execve.c
+++ b/cpukit/posix/src/execve.c
@@ -9,8 +9,7 @@
int execve(
const char *path,
char *const argv[],
- char *const envp[],
- ...
+ char *const envp[]
)
{
errno = ENOSYS;
diff --git a/cpukit/posix/src/execvp.c b/cpukit/posix/src/execvp.c
index a9d7694fbd..19f49fec58 100644
--- a/cpukit/posix/src/execvp.c
+++ b/cpukit/posix/src/execvp.c
@@ -8,7 +8,7 @@
int execvp(
const char *path,
- char const *argv[]
+ char *const argv[]
)
{
errno = ENOSYS;
diff --git a/cpukit/posix/src/psignal.c b/cpukit/posix/src/psignal.c
index 1df8def77d..07c2ad5b07 100644
--- a/cpukit/posix/src/psignal.c
+++ b/cpukit/posix/src/psignal.c
@@ -140,7 +140,7 @@ restart:
}
-/* XXX - add __SIGFIRSTNOTRT or something like that to newlib siginfo.h */
+/* XXX - add __SIGFIRSTNOTRT or something like that to newlib signal .h */
for ( signo = SIGHUP ; signo <= __SIGLASTNOTRT ; signo++ ) {
diff --git a/cpukit/posix/src/pthreadkill.c b/cpukit/posix/src/pthreadkill.c
index 37de5fc4c0..3b789fc8e7 100644
--- a/cpukit/posix/src/pthreadkill.c
+++ b/cpukit/posix/src/pthreadkill.c
@@ -13,6 +13,7 @@
#include <pthread.h>
+#include <signal.h>
#include <errno.h>
#include <rtems/system.h>
diff --git a/cpukit/posix/src/sigaction.c b/cpukit/posix/src/sigaction.c
index f7c525e002..aca5702329 100644
--- a/cpukit/posix/src/sigaction.c
+++ b/cpukit/posix/src/sigaction.c
@@ -13,6 +13,7 @@
#include <pthread.h>
+#include <signal.h>
#include <errno.h>
#include <rtems/system.h>
diff --git a/cpukit/posix/src/sigtimedwait.c b/cpukit/posix/src/sigtimedwait.c
index 3300b7383d..b87d9cbd3d 100644
--- a/cpukit/posix/src/sigtimedwait.c
+++ b/cpukit/posix/src/sigtimedwait.c
@@ -34,7 +34,7 @@ int _POSIX_signals_Get_highest(
return signo;
}
-/* XXX - add __SIGFIRSTNOTRT or something like that to newlib siginfo.h */
+/* XXX - add __SIGFIRSTNOTRT or something like that to newlib signal .h */
for ( signo = SIGHUP ; signo <= __SIGLASTNOTRT ; signo++ ) {
if ( set & signo_to_mask( signo ) )