--- gforth/configure.in 2007/04/15 20:33:46 1.183 +++ gforth/configure.in 2007/04/22 22:04:28 1.185 @@ -86,19 +86,20 @@ dnl --without-peephole disables peepho dnl but slower images.], dnl PEEPHOLE="$withval") +GCC_LD="\$(GCC)" +EC_MODE="false" +EC="" +engine2="engine2.o" +engine_fast2="engine-fast2.o" +no_dynamic="" +image_i="" +signals_o="io.o signals.o" + AC_ARG_WITH(ec, AC_HELP_STRING([--with-ec=], [ Build gforth for systems without OS.]), [if test "$withval" = "no"; then echo "defining hosted system" - EC_MODE="false" - EC="" - engine2="engine2.o" - engine_fast2="engine-fast2.o" - no_dynamic="" - image_i="" - signals_o="io.o signals.o" - GCC_LD="\$(GCC)" else echo "defining standalone system (${withval})" AC_DEFINE(STANDALONE,,[Define if you want a Gforth without OS]) @@ -116,7 +117,7 @@ else GCC_PATH=$(which $CC) LIB_PATH=${GCC_PATH%/*/*} GCC_LD="\$(LD)" - plattform=${withval} + platform=${withval} fi]) #variables mentioned in INSTALL @@ -201,7 +202,7 @@ case "$host_cpu" in arm*) machine=arm CFLAGS="$CFLAGS -fomit-frame-pointer" - if test x$plattform = xnxt; then + if test x$platform = xnxt; then CFLAGS="$CFLAGS -mthumb -mthumb-interwork" fi if test -z $arm_cacheflush; then @@ -306,18 +307,25 @@ case "$host_cpu" in esac AC_SUBST(host) -echo "Check for arch/$machine/$plattform/gforth.ld ($EC_MODE)" +MAKEINC="" + +echo "Check for arch/$machine/$platform/gforth.ld ($EC_MODE)" if test x$EC_MODE = xtrue then - echo "Check for arch/$machine/$plattform/gforth.ld" - if test -f arch/$machine/$plattform/gforth.ld + echo "Check for arch/$machine/$platform/gforth.ld" + if test -f arch/$machine/$platform/gforth.ld then - LDFLAGS="-T ../arch/$machine/$plattform/gforth.ld -Map \$@.map -cref --gc-sections $LDFLAGS" - if test x$plattform = xnxt; then + LDFLAGS="-T ../arch/$machine/$platform/gforth.ld -Map \$@.map -cref --gc-sections $LDFLAGS" + if test x$platform = xnxt; then LIBS="$LIB_PATH/lib/gcc/arm-elf/$($CC --version | grep GCC | cut -d' ' -f3)/interwork/libgcc.a $LIB_PATH/arm-elf/lib/interwork/libc.a $LIBS" fi fi + if test -f arch/$machine/$platform/make.inc + then + MAKEINC="include ../arch/$machine/$platform/make.inc" + fi fi +AC_SUBST(MAKEINC) test x$STACK_CACHE_DEFAULT_FAST = x && STACK_CACHE_DEFAULT_FAST=1 AC_DEFINE_UNQUOTED(STACK_CACHE_DEFAULT_FAST, $STACK_CACHE_DEFAULT_FAST,