--- gforth/configure.in 2007/02/15 13:39:04 1.170 +++ gforth/configure.in 2007/06/23 15:42:31 1.189 @@ -21,12 +21,12 @@ dnl Process this file with autoconf to p dnl We use some automake macros here, dnl but don't use automake for creating Makefile.in -AC_INIT([gforth],[0.6.2-20060527],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) +AC_INIT([gforth],[0.6.9-20070604],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) AC_PREREQ(2.54) #snapshots have numbers major.minor.release-YYYYMMDD #note that lexicographic ordering must be heeded. #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1! -UPDATED="April 09, 2006" +UPDATED="June 02, 2007" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) @@ -53,17 +53,6 @@ AC_ARG_ENABLE(force-ll, test "$enable_force_ll" = "no"|| AC_DEFINE(FORCE_LL,,[Define if you want to use explicit long long declarations for better performance (does not work with all GCC versions on all machines)]) -AC_ARG_ENABLE(gcc-pr15242-workaround, - AC_HELP_STRING([--disable-gcc-pr15242-workaround],[Disables - dynamic code generation on some versions of gcc - (slowdown~2 on Athlon) and causes slower building - of gforth (but gforth speedups) on others. - (default enabled)]), - ,enable_gcc_pr15242_workaround=yes) -test "$enable_gcc_pr15242_workaround" = "no"|| -AC_DEFINE(GCC_PR15242_WORKAROUND,,[Define if you want to get dynamic code -generation on gccs affected by PR15242]) - AC_ARG_ENABLE(force-cdiv, AC_HELP_STRING([--enable-force-cdiv], [ Use the native C division - symmetric - instead of @@ -97,24 +86,48 @@ dnl --without-peephole disables peepho dnl but slower images.], dnl PEEPHOLE="$withval") -AC_ARG_ENABLE(ec, - AC_HELP_STRING([--enable-ec], +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.]), - ,enable_ec=no) -if test "$enable_ec" = "yes"; then - echo "defining standalone system" +[if test "$withval" = "no"; then + echo "defining hosted system" +else + echo "defining standalone system (${withval})" AC_DEFINE(STANDALONE,,[Define if you want a Gforth without OS]) EC_MODE="true" -else - echo "defining hosted system" - EC_MODE="false" -fi + EC="-ec" + engine2="" + engine_fast2="" + no_dynamic="-DNO_DYNAMIC" + image_i="image.i" + if test "$withval" != "yes"; then + signals_o="io-${withval}.o" + else + signals_o="io.o" + fi + GCC_PATH=$(which $CC) + LIB_PATH=${GCC_PATH%/*/*} + GCC_LD="\$(LD)" + platform=${withval} +fi]) #variables mentioned in INSTALL AC_ARG_VAR(CC, [The C compiler (must support GNU C 2.x); gcc-2.95 recommended.]) AC_ARG_VAR(FORTHSIZES, [Gforth command line options for the default stack and dictionary sizes (see INSTALL).]) AC_ARG_VAR(STACK_CACHE_DEFAULT_FAST, [number of registers in the default stack cache state for gforth-fast and gforth-native (default 1).]) +AC_ARG_VAR(GCC_PR15242_WORKAROUND, [Force the enabling (1) or disabling (0) of a workaround for a gcc-3.x performance bug (default unset: use workaround for gcc-3.x)]) + AC_ARG_VAR(ac_cv_sizeof_char_p, [sizeof(char *)]) +AC_ARG_VAR(ac_cv_sizeof_void_p, [sizeof(void *)]) AC_ARG_VAR(ac_cv_sizeof_char, [sizeof(char)]) AC_ARG_VAR(ac_cv_sizeof_short, [sizeof(short)]) AC_ARG_VAR(ac_cv_sizeof_int, [sizeof(int)]) @@ -126,6 +139,8 @@ AC_ARG_VAR(ac_cv_sizeof_uint128_t, [size AC_ARG_VAR(ac_cv_c_bigendian, [Is the target big-endian ("yes" or "no")?]) AC_ARG_VAR(no_dynamic_default, [run gforth with --dynamic (0) or --no-dynamic (1) by default]) AC_ARG_VAR(skipcode, [assembly code for skipping 16 bytes of code]) +AC_ARG_VAR(asmcomment, [assembler comment start string]) +AC_ARG_VAR(arm_cacheflush, [file containing ARM cacheflush function (without .c)]) #set up feature test macros, so the tests get them right: # turn on all POSIX, SUSv3, and GNU features if available @@ -151,17 +166,24 @@ AC_PROG_CC test "$GCC" = "yes" || AC_MSG_ERROR(Gforth uses GNU C extensions and requires GCC 2.0 or higher) AC_SUBST(CC) +AC_SUBST(GCC_LD) AC_SUBST(DEBUGFLAG) +AC_SUBST(EC) AC_SUBST(EC_MODE) - +AC_SUBST(engine2) +AC_SUBST(engine_fast2) +AC_SUBST(no_dynamic) +AC_SUBST(image_i) +AC_SUBST(signals_o) + +#this is used to disable some (not generally essential) part of the +#Makefile that some makes don't grok. It would be better to test for +#this specific Makefile feature than the make version. AC_MSG_CHECKING(make type) -make_type=`make -v 2>&1|grep 'ake'|sed 's/ake .*/ake/'` - +make_type=`make -n -v 2>&1|grep 'ake'|sed 's/ake .*/ake/'` GNUMAKE='#' test "$make_type" = "GNU Make" && GNUMAKE='' - AC_MSG_RESULT($make_type) - AC_SUBST(GNUMAKE) AC_MSG_CHECKING([whether the linker accepts -export-dynamic]) @@ -180,10 +202,19 @@ case "$host_cpu" in arm*) machine=arm CFLAGS="$CFLAGS -fomit-frame-pointer" - if test -z $no_dynamic_default; then + if test x$platform = xnxt; then + CFLAGS="$CFLAGS -mthumb -mthumb-interwork" + fi + if test -z $arm_cacheflush; then no_dynamic_default=1 + arm_cacheflush=arch/arm/cacheflush0 AC_MSG_WARN([No I-cache flush code known, disabling dynamic native code generation]) fi + AC_LIBSOURCES([../arch/arm/cacheflush0, ../arch/arm/cacheflush1, ../arch/arm/cacheflush2]) + AC_LIBOBJ(../$arm_cacheflush) + #longer skipcodes lead to problems on ARM, and it uses + #only 4-byte alignment anyway + test "$skipcode" || skipcode="nop" ;; hppa*) machine=hppa @@ -198,15 +229,15 @@ case "$host_cpu" in ;; i386) machine=386 - CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem" + CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr" ;; i486) machine=386 - CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem -m486" + CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -m486" ;; i*86) machine=386 - CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem" + CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr" CFLAGS_1="$CFLAGS" CFLAGS="$CFLAGS -march=pentium" AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486") @@ -276,10 +307,38 @@ case "$host_cpu" in esac AC_SUBST(host) +MAKEINC="" + +echo "Check for arch/$machine/$platform/gforth.ld ($EC_MODE)" +if test x$EC_MODE = xtrue +then + echo "Check for arch/$machine/$platform/gforth.ld" + if test -f arch/$machine/$platform/gforth.ld + 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, [number of registers in the default stack cache state for gforth-fast and gforth-native]) +test x$GCC_PR15242_WORKAROUND = x || +AC_DEFINE_UNQUOTED(GCC_PR15242_WORKAROUND, $GCC_PR15242_WORKAROUND, + [force (1) or forbid (0) use of a workaround for a gcc performance bug]) + +dnl AC_DEFINE(GCC_PR15242_WORKAROUND,,[Define if you want to get dynamic code +dnl generation on gccs affected by PR15242]) + + if test "${enable_force_ll+set}" = set; then ac_includes_default="$ac_includes_default #include \"arch/generic/128bit.h\"" @@ -299,6 +358,19 @@ case "$ac_cv_sizeof_char_p" in ;; esac +AC_CHECK_SIZEOF(void *) +case "$ac_cv_sizeof_void_p" in + 2) + vwordsize=16 + ;; + 4) + vwordsize=32 + ;; + 8) + vwordsize=64 + ;; +esac + AC_CHECK_SIZEOF(char) AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) @@ -493,6 +565,14 @@ AC_TRY_COMPILE(,,ac_noreorder_blocks=yes CFLAGS="$CFLAGS_1" AC_MSG_RESULT($ac_noreorder_blocks) +# Try if GCC understands -falign-labels=1 +AC_MSG_CHECKING([if $CC understands -falign-labels=1]) +CFLAGS_1="$CFLAGS" +CFLAGS="$CFLAGS -falign-labels=1" +AC_TRY_COMPILE(,,ac_noreorder_blocks=yes;ENGINE_FLAGS="$ENGINE_FLAGS -falign-labels=1",ac_align_labels=no) +CFLAGS="$CFLAGS_1" +AC_MSG_RESULT($ac_align_labels) + # Try if GCC understands __attribute__((unused)) AC_MSG_CHECKING([how to suppress 'unused variable' warnings]) AC_TRY_COMPILE(,[int __attribute__((unused)) foo;], MAYBE_UNUSED='__attribute__((unused))',) @@ -541,13 +621,14 @@ AC_SUBST(DEFAULTSYSTEMPREFIX) AC_DEFINE_UNQUOTED(DEFAULTSYSTEMPREFIX,"$DEFAULTSYSTEMPREFIX",[default for environment variable GFORTHSYSTEMPREFIX]) #work around SELinux brain damage (from Andrew Haley <12t8f3jakb74g2c@news.supernews.com>) -AC_CHECK_PROG([MASSAGE_EXE],[chcon],[chcon -t unconfined_execmem_exec_t $@]) +#This magic incantation seems to be completely undocumented. +AC_CHECK_PROG([MASSAGE_EXE],[chcon],[chcon -t unconfined_execmem_exec_t],[true]) dnl Now a little support for DOS/DJGCC AC_SUBST(GFORTH_EXE) -GFORTH_EXE=$MASSAGE_EXE +GFORTH_EXE="" AC_SUBST(GFORTHFAST_EXE) -GFORTHFAST_EXE=$MASSAGE_EXE +GFORTHFAST_EXE="" AC_SUBST(GFORTHITC_EXE) GFORTHITC_EXE="" AC_SUBST(GFORTHDITC_EXE) @@ -635,6 +716,24 @@ else AC_DEFINE_UNQUOTED(SKIP16,asm("$skipcode"),statement for skipping 16 bytes) fi +AC_MSG_CHECKING([if and how we can do comments in asm statements]) +#the point here is to get asm statements that look different to +#gcc's "optimizer" +if test -z "$asmcomment"; then + asmcomment=no + CFLAGS_1="$CFLAGS" + CFLAGS="$CFLAGS $ENGINE_FLAGS" + for i in '"# "' '"! "' '"; "'; do + AC_TRY_COMPILE(,[asm($i"fluffystunk");],asmcomment=$i; break,) + done + CFLAGS=$CFLAGS_1 +fi +AC_MSG_RESULT($asmcomment) +if test "$asmcomment" != no +then + AC_DEFINE_UNQUOTED(ASMCOMMENT,$asmcomment,[assembler comment start string]) +fi + test "$no_dynamic_default" || no_dynamic_default=0 AC_DEFINE_UNQUOTED(NO_DYNAMIC_DEFAULT,$no_dynamic_default,default value for no_dynamic) @@ -678,7 +777,7 @@ then fi AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal atanh) AC_FUNC_FSEEKO -AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage) +AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage nanosleep) AC_CHECK_TYPES(stack_t,,,[#include ]) AC_DECL_SYS_SIGLIST AC_CHECK_FUNC(getopt_long,[true],[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)]) @@ -692,14 +791,18 @@ test $ac_cv_func_fnmatch_works = yes || AC_CHECK_FUNCS(mmap sysconf getpagesize) AM_PATH_LISPDIR -kernel_fi=kernl${wordsize}${bytesex}.fi +kernel_fi=kernl${vwordsize}${bytesex}.fi +include_fi=kernl${wordsize}${bytesex}${EC}.fi AC_SUBST(kernel_fi) +AC_SUBST(include_fi) #this breaks bindists #dnl replace srource directory by absolute value #if test $srcdir = "."; then srcdir=`pwd` #fi +echo "version=$PACKAGE_VERSION" + AC_SUBST(machine) AC_CONFIG_FILES([ Makefile @@ -709,12 +812,15 @@ vmgen machpc.fs envos.fs engine/Makefile +engine/libcc.h doc/version.texi build-ec ]) AC_CONFIG_COMMANDS([stamp-h],[[echo timestamp > stamp-h chmod +x gforthmi chmod +x vmgen chmod +x build-ec -test -d kernel||mkdir kernel]],[[]]) +test -d kernel||mkdir kernel +$srcdir/mkinstalldirs include/gforth/$PACKAGE_VERSION +ln -s ../../../engine/config.h ../../../engine/libcc.h include/gforth/$PACKAGE_VERSION]],[[PACKAGE_VERSION=$PACKAGE_VERSION]]) AC_OUTPUT