RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* Makefile.am: Merge in rtems/Makefile.am and
	rtems/score/Makefile.am. Remove gensize. Require automake-1.5.
	* rtems/Makefile.am: Removed.
	* rtems/score/Makefile.am: Removed.
	* rtems/score/.cvsignore: Add unixsize.h*. Add stamp-h*.
	* configure.ac: Add AM_CONFIG_HEADER(rtems/score/unixsize.h).
	* rtems/score/cpu.h: Replace CPU_CONTEXT_SIZE_IN_BYTES with
	SIZEOF_CPU_CONTEXT.
This commit is contained in:
Joel Sherrill
2002-01-24 14:13:15 +00:00
parent 2fc6dc313d
commit 1feedea303
12 changed files with 126 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
c/src/exec/score/cpu/unix/ChangeLog
View File

@@ -1,3 +1,14 @@
2002-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge in rtems/Makefile.am and
rtems/score/Makefile.am. Remove gensize. Require automake-1.5.
* rtems/Makefile.am: Removed.
* rtems/score/Makefile.am: Removed.
* rtems/score/.cvsignore: Add unixsize.h*. Add stamp-h*.
* configure.ac: Add AM_CONFIG_HEADER(rtems/score/unixsize.h).
* rtems/score/cpu.h: Replace CPU_CONTEXT_SIZE_IN_BYTES with
SIZEOF_CPU_CONTEXT.
2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add multilib support. * Makefile.am: Add multilib support.

26
c/src/exec/score/cpu/unix/Makefile.am
View File

@@ -2,17 +2,36 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/multilib.am
include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/compile.am
include $(top_srcdir)/../../../../../../automake/lib.am include $(top_srcdir)/../../../../../../automake/lib.am
SUBDIRS = rtems
AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES) AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/score:
$(mkinstalldirs) $@
include_rtems_scoredir = $(includedir)/rtems/score
include_rtems_score_HEADERS = \
rtems/score/unixtypes.h \
rtems/score/cpu.h \
rtems/score/unix.h \
rtems/score/unixsize.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
$(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
C_FILES = cpu.c C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -29,5 +48,4 @@ all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL)
EXTRA_DIST = cpu.c EXTRA_DIST = cpu.c
include $(top_srcdir)/../../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../../automake/local.am include $(top_srcdir)/../../../../../../automake/local.am

33
c/src/exec/score/cpu/unix/configure.ac
View File

@@ -27,12 +27,33 @@ RTEMS_CHECK_NEWLIB
RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
# The only use of System V IPC is the UNIX port when multiprocessing. # The only use of System V IPC is the UNIX port when multiprocessing.
if test "$HAS_MP" = "yes"; then AS_IF([test "$HAS_MP" = "yes"],
RTEMS_CHECK_SYSV_UNIX [RTEMS_CHECK_SYSV_UNIX])
fi
## The code fragment below had been used in tools/cpu/unix/gensize.c.
## FIXME:
## * The sun-stuff needs to be looked after.
## * The pad very likely is not necessary.
AC_CHECK_SIZEOF([CPU_CONTEXT],[],[
#if defined(__sun__) && defined(__sparc__) && \
defined(__unix__) && defined(__svr4__)
#undef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 3
#undef __STRICT_ANSI__
#endif
#include <stdio.h>
#include <setjmp.h>
typedef struct {
jmp_buf regs;
int isr_level;
int pad[4]; /* just in case */
} CPU_CONTEXT;
])
AM_CONFIG_HEADER(rtems/score/unixsize.h)
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile])
rtems/Makefile
rtems/score/Makefile])
AC_OUTPUT AC_OUTPUT

10
c/src/exec/score/cpu/unix/rtems/Makefile.am
View File

@@ -1,10 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = score
include $(top_srcdir)/../../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../../automake/local.am

2
c/src/exec/score/cpu/unix/rtems/score/.cvsignore
View File

@@ -1,2 +1,4 @@
Makefile Makefile
Makefile.in Makefile.in
unixsize.h*
stamp-h*

36
c/src/exec/score/cpu/unix/rtems/score/Makefile.am
View File

@@ -1,36 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtems_scoredir = $(includedir)/rtems/score
GENSIZE = $(PROJECT_TOPdir)/tools/cpu/unix/gensize
GENERIC_H_FILES = unixsize.h
include_rtems_score_HEADERS = cpu.h unixtypes.h unix.h
#
# (OPTIONAL) Add local stuff here using +=
#
unixsize.h: $(GENSIZE) cpu.h
$(RM) $@
$(GENSIZE) > $@
CLEANFILES = unixsize.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
$(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \
$(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
$(PROJECT_INCLUDE)/rtems/score:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
$(INSTALL_DATA) $< $@
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../../../../automake/local.am

2
c/src/exec/score/cpu/unix/rtems/score/cpu.h
View File

@@ -493,7 +493,7 @@ extern "C" {
#endif #endif
typedef struct { typedef struct {
char Area[ CPU_CONTEXT_SIZE_IN_BYTES ] CONTEXT_STRUCTURE_ALIGNMENT; char Area[ SIZEOF_CPU_CONTEXT ] CONTEXT_STRUCTURE_ALIGNMENT;
} Context_Control; } Context_Control;
typedef struct { typedef struct {

11
cpukit/score/cpu/unix/ChangeLog
View File

@@ -1,3 +1,14 @@
2002-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge in rtems/Makefile.am and
rtems/score/Makefile.am. Remove gensize. Require automake-1.5.
* rtems/Makefile.am: Removed.
* rtems/score/Makefile.am: Removed.
* rtems/score/.cvsignore: Add unixsize.h*. Add stamp-h*.
* configure.ac: Add AM_CONFIG_HEADER(rtems/score/unixsize.h).
* rtems/score/cpu.h: Replace CPU_CONTEXT_SIZE_IN_BYTES with
SIZEOF_CPU_CONTEXT.
2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add multilib support. * Makefile.am: Add multilib support.

26
cpukit/score/cpu/unix/Makefile.am
View File

@@ -2,17 +2,36 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/multilib.am
include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/compile.am
include $(top_srcdir)/../../../../../../automake/lib.am include $(top_srcdir)/../../../../../../automake/lib.am
SUBDIRS = rtems
AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES) AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/score:
$(mkinstalldirs) $@
include_rtems_scoredir = $(includedir)/rtems/score
include_rtems_score_HEADERS = \
rtems/score/unixtypes.h \
rtems/score/cpu.h \
rtems/score/unix.h \
rtems/score/unixsize.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
$(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
C_FILES = cpu.c C_FILES = cpu.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -29,5 +48,4 @@ all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL)
EXTRA_DIST = cpu.c EXTRA_DIST = cpu.c
include $(top_srcdir)/../../../../../../automake/subdirs.am
include $(top_srcdir)/../../../../../../automake/local.am include $(top_srcdir)/../../../../../../automake/local.am

33
cpukit/score/cpu/unix/configure.ac
View File

@@ -27,12 +27,33 @@ RTEMS_CHECK_NEWLIB
RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
# The only use of System V IPC is the UNIX port when multiprocessing. # The only use of System V IPC is the UNIX port when multiprocessing.
if test "$HAS_MP" = "yes"; then AS_IF([test "$HAS_MP" = "yes"],
RTEMS_CHECK_SYSV_UNIX [RTEMS_CHECK_SYSV_UNIX])
fi
## The code fragment below had been used in tools/cpu/unix/gensize.c.
## FIXME:
## * The sun-stuff needs to be looked after.
## * The pad very likely is not necessary.
AC_CHECK_SIZEOF([CPU_CONTEXT],[],[
#if defined(__sun__) && defined(__sparc__) && \
defined(__unix__) && defined(__svr4__)
#undef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 3
#undef __STRICT_ANSI__
#endif
#include <stdio.h>
#include <setjmp.h>
typedef struct {
jmp_buf regs;
int isr_level;
int pad[4]; /* just in case */
} CPU_CONTEXT;
])
AM_CONFIG_HEADER(rtems/score/unixsize.h)
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile])
rtems/Makefile
rtems/score/Makefile])
AC_OUTPUT AC_OUTPUT

2
cpukit/score/cpu/unix/rtems/score/.cvsignore
View File

@@ -1,2 +1,4 @@
Makefile Makefile
Makefile.in Makefile.in
unixsize.h*
stamp-h*

2
cpukit/score/cpu/unix/rtems/score/cpu.h
View File

@@ -493,7 +493,7 @@ extern "C" {
#endif #endif
typedef struct { typedef struct {
char Area[ CPU_CONTEXT_SIZE_IN_BYTES ] CONTEXT_STRUCTURE_ALIGNMENT; char Area[ SIZEOF_CPU_CONTEXT ] CONTEXT_STRUCTURE_ALIGNMENT;
} Context_Control; } Context_Control;
typedef struct { typedef struct {