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.

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).

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

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