summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpukit/ChangeLog11
-rw-r--r--cpukit/libcsupport/preinstall.am16
-rw-r--r--cpukit/posix/preinstall.am16
-rw-r--r--cpukit/posix/src/aio.c19
-rw-r--r--cpukit/posix/src/clockgetcpuclockid.c2
-rw-r--r--cpukit/posix/src/clockgetenableattr.c2
-rw-r--r--cpukit/posix/src/clockgettime.c2
-rw-r--r--cpukit/posix/src/clocksetenableattr.c2
-rw-r--r--cpukit/posix/src/clocksettime.c4
-rw-r--r--cpukit/posix/src/devctl.c4
-rw-r--r--cpukit/posix/src/pthreadcreate.c2
-rw-r--r--cpukit/posix/src/pthreadgetcpuclockid.c3
-rw-r--r--cpukit/posix/src/types.c15
-rw-r--r--cpukit/rtems/preinstall.am16
-rw-r--r--cpukit/sapi/Makefile.am1
-rw-r--r--cpukit/sapi/preinstall.am16
-rw-r--r--cpukit/score/Makefile.am1
-rw-r--r--cpukit/score/preinstall.am16
18 files changed, 109 insertions, 39 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index bd4f990202..2279e09ee6 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,16 @@
2007-12-13 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * libcsupport/preinstall.am, posix/preinstall.am, posix/src/aio.c,
+ posix/src/clockgetcpuclockid.c, posix/src/clockgetenableattr.c,
+ posix/src/clockgettime.c, posix/src/clocksetenableattr.c,
+ posix/src/clocksettime.c, posix/src/devctl.c,
+ posix/src/pthreadcreate.c, posix/src/pthreadgetcpuclockid.c,
+ posix/src/types.c, rtems/preinstall.am, sapi/Makefile.am,
+ sapi/preinstall.am, score/Makefile.am, score/preinstall.am: Eliminate
+ POSIX_NOT_IMPLEMENTED(). Return ENOSYS instead.
+
+2007-12-13 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* posix/src/adjtime.c: Clean up and verify against behavior documented
in GNU/Linux man page provided with Fedora 7.
diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am
index 520d071de9..36011e9725 100644
--- a/cpukit/libcsupport/preinstall.am
+++ b/cpukit/libcsupport/preinstall.am
@@ -8,10 +8,24 @@ endif
PREINSTALL_DIRS =
DISTCLEANFILES = $(PREINSTALL_DIRS)
+all-local: $(TMPINSTALL_FILES)
+
+TMPINSTALL_FILES =
+CLEANFILES = $(TMPINSTALL_FILES)
+
all-am: $(PREINSTALL_FILES)
PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
+CLEANFILES += $(PREINSTALL_FILES)
+
+$(PROJECT_LIB)/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_LIB)
+ @: > $(PROJECT_LIB)/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
+
+$(PROJECT_LIB)/libcsupport.a: libcsupport.a $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libcsupport.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/libcsupport.a
$(PROJECT_INCLUDE)/rtems/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am
index 5531e7c852..aeaf59f589 100644
--- a/cpukit/posix/preinstall.am
+++ b/cpukit/posix/preinstall.am
@@ -8,10 +8,20 @@ endif
PREINSTALL_DIRS =
DISTCLEANFILES = $(PREINSTALL_DIRS)
+all-local: $(TMPINSTALL_FILES)
+
+TMPINSTALL_FILES =
+CLEANFILES = $(TMPINSTALL_FILES)
+
all-am: $(PREINSTALL_FILES)
PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
+CLEANFILES += $(PREINSTALL_FILES)
+
+$(PROJECT_LIB)/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_LIB)
+ @: > $(PROJECT_LIB)/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
$(PROJECT_INCLUDE)/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)
@@ -19,6 +29,10 @@ $(PROJECT_INCLUDE)/$(dirstamp):
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
if LIBPOSIX
+$(PROJECT_LIB)/libposix.a: libposix.a $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libposix.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/libposix.a
+
if HAS_PTHREADS
$(PROJECT_INCLUDE)/sched.h: include/sched.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sched.h
diff --git a/cpukit/posix/src/aio.c b/cpukit/posix/src/aio.c
index f993a5f2d5..692a3cdf60 100644
--- a/cpukit/posix/src/aio.c
+++ b/cpukit/posix/src/aio.c
@@ -7,12 +7,11 @@
#endif
#include <aio.h>
+#include <errno.h>
#include <rtems/system.h>
#include <rtems/seterr.h>
-int POSIX_NOT_IMPLEMENTED();
-
/*PAGE
*
* 6.7.2 Asynchronous Read, P1003.1b-1993, p. 154
@@ -22,7 +21,7 @@ int aio_read(
struct aiocb *aiocbp
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
/*PAGE
@@ -34,7 +33,7 @@ int aio_write(
struct aiocb *aiocbp
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
/*PAGE
@@ -49,7 +48,7 @@ int lio_listio(
struct sigevent *sig
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
/*PAGE
@@ -61,7 +60,7 @@ int aio_error(
const struct aiocb *aiocbp
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
/*PAGE
@@ -74,7 +73,7 @@ int aio_return(
const struct aiocb *aiocbp
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
/*PAGE
@@ -87,7 +86,7 @@ int aio_cancel(
struct aiocb *aiocbp
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
/*PAGE
@@ -101,7 +100,7 @@ int aio_suspend(
const struct timespec *timeout
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
/*PAGE
@@ -114,5 +113,5 @@ int aio_fsync(
struct aiocb *aiocbp
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
diff --git a/cpukit/posix/src/clockgetcpuclockid.c b/cpukit/posix/src/clockgetcpuclockid.c
index 436c976d05..9623eba741 100644
--- a/cpukit/posix/src/clockgetcpuclockid.c
+++ b/cpukit/posix/src/clockgetcpuclockid.c
@@ -27,5 +27,5 @@ int clock_getcpuclockid(
clockid_t *clock_id
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
diff --git a/cpukit/posix/src/clockgetenableattr.c b/cpukit/posix/src/clockgetenableattr.c
index aae7b2a898..53e121deb9 100644
--- a/cpukit/posix/src/clockgetenableattr.c
+++ b/cpukit/posix/src/clockgetenableattr.c
@@ -27,5 +27,5 @@ int clock_getenable_attr(
int *attr
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
diff --git a/cpukit/posix/src/clockgettime.c b/cpukit/posix/src/clockgettime.c
index 938b6f87e3..91e3c96d73 100644
--- a/cpukit/posix/src/clockgettime.c
+++ b/cpukit/posix/src/clockgettime.c
@@ -49,7 +49,7 @@ int clock_gettime(
#ifdef _POSIX_THREAD_CPUTIME
case CLOCK_THREAD_CPUTIME:
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
break;
#endif
default:
diff --git a/cpukit/posix/src/clocksetenableattr.c b/cpukit/posix/src/clocksetenableattr.c
index 8e40fd67b1..386e9d0c27 100644
--- a/cpukit/posix/src/clocksetenableattr.c
+++ b/cpukit/posix/src/clocksetenableattr.c
@@ -27,5 +27,5 @@ int clock_setenable_attr(
int attr
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
diff --git a/cpukit/posix/src/clocksettime.c b/cpukit/posix/src/clocksettime.c
index c733e6f378..f625d99c28 100644
--- a/cpukit/posix/src/clocksettime.c
+++ b/cpukit/posix/src/clocksettime.c
@@ -42,13 +42,13 @@ int clock_settime(
#ifdef _POSIX_CPUTIME
case CLOCK_PROCESS_CPUTIME:
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
break;
#endif
#ifdef _POSIX_THREAD_CPUTIME
case CLOCK_THREAD_CPUTIME:
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
break;
#endif
default:
diff --git a/cpukit/posix/src/devctl.c b/cpukit/posix/src/devctl.c
index 9800a109eb..ab6dc6bc4b 100644
--- a/cpukit/posix/src/devctl.c
+++ b/cpukit/posix/src/devctl.c
@@ -7,8 +7,10 @@
#endif
#include <devctl.h>
+#include <errno.h>
#include <rtems/system.h>
+#include <rtems/seterr.h>
/*PAGE
*
@@ -22,5 +24,5 @@ int devctl(
int *dev_info_ptr
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
diff --git a/cpukit/posix/src/pthreadcreate.c b/cpukit/posix/src/pthreadcreate.c
index b2b1ed128b..2423bda4d3 100644
--- a/cpukit/posix/src/pthreadcreate.c
+++ b/cpukit/posix/src/pthreadcreate.c
@@ -58,7 +58,7 @@ int pthread_create(
#if 0
int cputime_clock_allowed; /* see time.h */
- POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
#endif
/*
diff --git a/cpukit/posix/src/pthreadgetcpuclockid.c b/cpukit/posix/src/pthreadgetcpuclockid.c
index 7769e4b7c6..65a4c9bc99 100644
--- a/cpukit/posix/src/pthreadgetcpuclockid.c
+++ b/cpukit/posix/src/pthreadgetcpuclockid.c
@@ -19,11 +19,12 @@
#include <errno.h>
#include <rtems/system.h>
+#include <rtems/seterr.h>
int pthread_getcpuclockid(
pthread_t pid,
clockid_t *clock_id
)
{
- return POSIX_NOT_IMPLEMENTED();
+ rtems_set_errno_and_return_minus_one( ENOSYS );
}
diff --git a/cpukit/posix/src/types.c b/cpukit/posix/src/types.c
index 89fc961947..52e5841e3b 100644
--- a/cpukit/posix/src/types.c
+++ b/cpukit/posix/src/types.c
@@ -17,18 +17,3 @@
#include <rtems/score/object.h>
#include <rtems/seterr.h>
-/*
- * TEMPORARY
- */
-
-#include <assert.h>
-
-int POSIX_NOT_IMPLEMENTED()
-{
- assert( 0 );
- return 0;
-}
-
-/*
- * END OF TEMPORARY
- */
diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am
index 8d00fe9ad3..2d793d70c6 100644
--- a/cpukit/rtems/preinstall.am
+++ b/cpukit/rtems/preinstall.am
@@ -8,16 +8,30 @@ endif
PREINSTALL_DIRS =
DISTCLEANFILES = $(PREINSTALL_DIRS)
+all-local: $(TMPINSTALL_FILES)
+
+TMPINSTALL_FILES =
+CLEANFILES = $(TMPINSTALL_FILES)
+
all-am: $(PREINSTALL_FILES)
PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
+CLEANFILES += $(PREINSTALL_FILES)
+
+$(PROJECT_LIB)/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_LIB)
+ @: > $(PROJECT_LIB)/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
$(PROJECT_INCLUDE)/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)
@: > $(PROJECT_INCLUDE)/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_LIB)/librtems.a: librtems.a $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/librtems.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/librtems.a
+
$(PROJECT_INCLUDE)/rtems.h: include/rtems.h $(PROJECT_INCLUDE)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems.h
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index ad4b3fa864..1b0a06a7af 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -19,6 +19,7 @@ include_rtems_HEADERS += inline/rtems/extension.inl
## src
AM_CPPFLAGS += -D__RTEMS_INSIDE__
+project_lib_LIBRARIES = libsapi.a
noinst_LIBRARIES = libsapi.a
libsapi_a_SOURCES = src/debug.c src/extension.c src/extensioncreate.c \
src/extensiondelete.c src/extensionident.c src/fatal.c src/exinit.c \
diff --git a/cpukit/sapi/preinstall.am b/cpukit/sapi/preinstall.am
index e3f34d07ba..9718e904db 100644
--- a/cpukit/sapi/preinstall.am
+++ b/cpukit/sapi/preinstall.am
@@ -8,10 +8,20 @@ endif
PREINSTALL_DIRS =
DISTCLEANFILES = $(PREINSTALL_DIRS)
+all-local: $(TMPINSTALL_FILES)
+
+TMPINSTALL_FILES =
+CLEANFILES = $(TMPINSTALL_FILES)
+
all-am: $(PREINSTALL_FILES)
PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
+CLEANFILES += $(PREINSTALL_FILES)
+
+$(PROJECT_LIB)/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_LIB)
+ @: > $(PROJECT_LIB)/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
$(PROJECT_INCLUDE)/rtems/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
@@ -54,3 +64,7 @@ $(PROJECT_INCLUDE)/rtems/extension.inl: inline/rtems/extension.inl $(PROJECT_INC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl
+$(PROJECT_LIB)/libsapi.a: libsapi.a $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libsapi.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/libsapi.a
+
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index c5163e1817..68495af394 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -64,6 +64,7 @@ endif
AM_CPPFLAGS += -D__RTEMS_INSIDE__
+project_lib_LIBRARIES = libscore.a
noinst_LIBRARIES = libscore.a
libscore_a_SOURCES =
libscore_a_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am
index 040616aa6a..984dd9a99f 100644
--- a/cpukit/score/preinstall.am
+++ b/cpukit/score/preinstall.am
@@ -8,10 +8,20 @@ endif
PREINSTALL_DIRS =
DISTCLEANFILES += $(PREINSTALL_DIRS)
+all-local: $(TMPINSTALL_FILES)
+
+TMPINSTALL_FILES =
+CLEANFILES = $(TMPINSTALL_FILES)
+
all-am: $(PREINSTALL_FILES)
PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
+CLEANFILES += $(PREINSTALL_FILES)
+
+$(PROJECT_LIB)/$(dirstamp):
+ @$(MKDIR_P) $(PROJECT_LIB)
+ @: > $(PROJECT_LIB)/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
$(PROJECT_INCLUDE)/rtems/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/rtems
@@ -273,3 +283,7 @@ $(PROJECT_INCLUDE)/rtems/score/threadmp.inl: inline/rtems/score/threadmp.inl $(P
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadmp.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadmp.inl
endif
+$(PROJECT_LIB)/libscore.a: libscore.a $(PROJECT_LIB)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_LIB)/libscore.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/libscore.a
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 04:41:55 +0000