diff options
| author | Neal H. Walfield <neal@gnu.org> | 2009-01-16 00:07:53 +0100 |
|---|---|---|
| committer | Neal H. Walfield <neal@gnu.org> | 2009-01-16 07:17:34 +0100 |
| commit | bfc5898af12f65e103608a54e5c9159554896fba (patch) | |
| tree | 8d3779dfb05090c948921e8dc39b0174a315cb54 | |
| parent | 410011ca8f7e46c86b52258f82e954514674776b (diff) | |
Provide option --enable-l4, not --enable-l4-abi, define USE_L4.
2009-01-16 Neal H. Walfield <neal@gnu.org>
* configure.ac (--enable-l4-abi): Replace option with...
(--enable-l4): ... this option.
(l4_abi): Set appropriately.
(USE_L4): Define as a preprocessor macro (if appropriate) and an
automake conditional.
* README: Update build instructions.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | README | 8 | ||||
| -rw-r--r-- | configure.ac | 44 | ||||
| -rw-r--r-- | libl4/ChangeLog | 4 | ||||
| -rw-r--r-- | libl4/Makefile.am | 3 |
5 files changed, 41 insertions, 27 deletions
@@ -1,3 +1,12 @@ +2009-01-16 Neal H. Walfield <neal@gnu.org> + + * configure.ac (--enable-l4-abi): Replace option with... + (--enable-l4): ... this option. + (l4_abi): Set appropriately. + (USE_L4): Define as a preprocessor macro (if appropriate) and an + automake conditional. + * README: Update build instructions. + 2008-11-19 Neal H. Walfield <neal@gnu.org> * configure.ac: Rename amd64 to x86_64. Update users. @@ -32,12 +32,12 @@ Building the code is straightforward: $ autoreconf -i $ mkdir test build $ cd test/ -$ ../configure --enable-l4-abi=x2 \ - --host=i686-pc-viengoos-gnu --enable-tests +$ ../configure --enable-l4 --host=i686-pc-viengoos-gnu \ + --enable-tests $ make check $ cd ../build/ -$ ../configure --enable-l4-abi=x2 \ - --host=i686-pc-viengoos-gnu --with-newlib +$ ../configure --enable-l4 --host=i686-pc-viengoos-gnu \ + --with-newlib $ make [to build the cross compiler] $ make [to build Viengoos proper] $ mkdir /l4/boot diff --git a/configure.ac b/configure.ac index aaa6bb0..e4ec182 100644 --- a/configure.ac +++ b/configure.ac @@ -153,32 +153,31 @@ AM_CONDITIONAL([ARCH_IA64], $arch_ia64) AM_CONDITIONAL([ARCH_POWERPC], $arch_powerpc) AM_CONDITIONAL([ARCH_POWERPC64], $arch_powerpc64) -l4_abi_v2=false +# Whether to use L4. +l4_abi=false l4_abi_x2=false -AC_ARG_ENABLE([l4-abi], - AC_HELP_STRING([--enable-l4-abi=abi], - [L4 ABI to use (supported are: v2, x2)]), - [ac_cv_use_l4_abi=$enableval], [ac_cv_use_l4_abi=no]) -AC_DEFINE([USE_L4], [], [Whether to use L4.]) -case $ac_cv_use_l4_abi in - v2) - l4_abi=v2 - l4_abi_v2=true - ;; - x2) +AC_ARG_ENABLE([l4], + AC_HELP_STRING([--enable-l4=yes], + [Use L4 as a hardware abstraction layer.]), + [ac_cv_use_l4=$enableval], [ac_cv_use_l4=no]) +case $ac_cv_use_l4 in + yes|true) l4_abi=x2 l4_abi_x2=true ;; no) - AC_MSG_ERROR([L4 ABI not specified; select an ABI using --enable-l4-abi]) + l4_abi=false ;; *) - AC_MSG_ERROR([unsupported L4 ABI $ac_cv_use_l4_abi]) + AC_MSG_ERROR([invalid value passed to --enable-l4]) ;; esac -AM_CONDITIONAL([L4_ABI_V2], $l4_abi_v2) +AM_CONDITIONAL([USE_L4], test x$l4_abi != xfalse) AM_CONDITIONAL([L4_ABI_X2], $l4_abi_x2) -AC_MSG_NOTICE([compiling for L4 ABI $l4_abi]) +if test $l4_abi != false +then + AC_MSG_NOTICE([compiling for L4.]) +fi # Configure components. m4_include([laden/config.m4]) @@ -263,17 +262,22 @@ case $ac_cv_runtime_checks in ;; esac +if test $l4_abi != false +then + USE_L4="-DUSE_L4=1" +fi + USER_CPPFLAGS=" \ - $CPP_CHECKS \ - -D_GNU_SOURCE -DUSE_L4 \ + $CPP_CHECKS $USE_L4 \ + -D_GNU_SOURCE \ -I${LIBC}/include \ -I${ABS_SRCDIR}/libc-parts" USER_CFLAGS="-std=gnu99 -Wall -g -O2 $libc_cv_gnu89_inline $C_CHECKS" USER_LDFLAGS="-u_start -e_start" KERNEL_CPPFLAGS="\ - $CPP_CHECKS \ - -D_GNU_SOURCE -DRM_INTERN -DUSE_L4 \ + $CPP_CHECKS $USE_L4 \ + -D_GNU_SOURCE -DRM_INTERN \ -I${ABS_SRCDIR}/libc-parts" KERNEL_CFLAGS="-std=gnu99 -Wall -g -O2 $libc_cv_gnu89_inline $C_CHECKS" diff --git a/libl4/ChangeLog b/libl4/ChangeLog index 62a5ecf..170e185 100644 --- a/libl4/ChangeLog +++ b/libl4/ChangeLog @@ -1,5 +1,9 @@ 2008-11-19 Neal H. Walfield <neal@gnu.org> + * Makefile.am (L4_ABI_SUBDIR): Remove check for v2. + +2008-11-19 Neal H. Walfield <neal@gnu.org> + * headers.m4: Only link the header files if $ARCH is ia32. 2008-12-04 Neal H. Walfield <neal@gnu.org> diff --git a/libl4/Makefile.am b/libl4/Makefile.am index cc10e02..9bebc64 100644 --- a/libl4/Makefile.am +++ b/libl4/Makefile.am @@ -24,9 +24,6 @@ endif if ARCH_POWERPC ARCH_SUBDIR = powerpc endif -if L4_ABI_V2 - L4_ABI_SUBDIR = v2 -endif if L4_ABI_X2 L4_ABI_SUBDIR = x2 endif |