diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-05 06:12:14 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-05 06:12:14 +0000 |
commit | 10ae124ce1e9ec42477cb828a898e9a1207e839a (patch) | |
tree | c17f903723510153659038de17d1151744f631b4 | |
parent | 2004-04-03 Wilfried Busalski <w.busalski@lancier-monitoring.de> (diff) | |
download | rtems-10ae124ce1e9ec42477cb828a898e9a1207e839a.tar.bz2 |
2004-04-05 Ralf Corsepius <ralf_corsepius@rtems.org>
* configure.ac: Add AC_CHECK_SIZEOF([CPU_CONTEXT]..).
Add SIZEOF_CPU_CONTEXT to cpuopts.h.
Add RTEMS_PROG_CCAS.
* acinclude.m4: Use unquoted "here" document to propagate $3 to
cpuopts.tmp.
-rw-r--r-- | cpukit/ChangeLog | 8 | ||||
-rw-r--r-- | cpukit/acinclude.m4 | 2 | ||||
-rw-r--r-- | cpukit/configure.ac | 22 |
3 files changed, 31 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index a9d2b85f31..2576bbe9f1 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2004-04-05 Ralf Corsepius <ralf_corsepius@rtems.org> + + * configure.ac: Add AC_CHECK_SIZEOF([CPU_CONTEXT]..). + Add SIZEOF_CPU_CONTEXT to cpuopts.h. + Add RTEMS_PROG_CCAS. + * acinclude.m4: Use unquoted "here" document to propagate $3 to + cpuopts.tmp. + 2004-04-02 Ralf Corsepius <ralf_corsepius@rtems.org> * libnetworking/Makefile.am: AM_CPPFLAGS += -I$(srcdir). diff --git a/cpukit/acinclude.m4 b/cpukit/acinclude.m4 index fdf2bec89b..a01901df78 100644 --- a/cpukit/acinclude.m4 +++ b/cpukit/acinclude.m4 @@ -3,7 +3,7 @@ AC_DEFUN([RTEMS_CPUOPT], [ if $2; then -cat >>cpuopts.tmp <<\_ACEOF +cat >>cpuopts.tmp <<_ACEOF /* $4 */ #define $1 $3 diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 4d6aacdcb4..27c0133c68 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -32,6 +32,7 @@ else fi RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) +RTEMS_PROG_CCAS RTEMS_CANONICALIZE_TOOLS AM_PROG_CC_C_O AC_PROG_RANLIB @@ -89,6 +90,22 @@ AC_CHECK_FUNCS([strsep strcasecmp snprintf]) AC_CHECK_FUNCS([bcopy bcmp]) AC_CHECK_FUNCS([isascii fileno]) +AS_IF([test x"${RTEMS_CPU}" = x"unix"],[ +## The code fragment below had been used in tools/cpu/unix/gensize.c. +## FIXME: +## * The pad very likely is not necessary. +AC_CHECK_SIZEOF([CPU_CONTEXT],[],[ +#include <stdio.h> +#include <setjmp.h> + +typedef struct { + jmp_buf regs; + int isr_level; + int pad[4]; /* just in case */ +} CPU_CONTEXT; +]) +]) + cat >>cpuopts.tmp <<\_ACEOF /* target cpu dependent options file */ /* automatically generated -- DO NOT EDIT!! */ @@ -146,6 +163,11 @@ RTEMS_CPUOPT([RTEMS_VERSION], ["]_RTEMS_VERSION["], [RTEMS version string]) +RTEMS_CPUOPT([SIZEOF_CPU_CONTEXT], + [test x"$RTEMS_CPU" = x"unix"], + [$ac_cv_sizeof_CPU_CONTEXT], + [The size of a 'CPU_CONTEXT', as computed by sizeof]) + cat >>cpuopts.tmp <<\_ACEOF #endif |