--- gforth/configure.in 2003/08/06 09:35:49 1.126 +++ gforth/configure.in 2005/01/29 16:55:30 1.150 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -#Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc. #This file is part of Gforth. @@ -21,27 +21,67 @@ 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.1],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth]) +AC_INIT([gforth],[0.6.2-20030910],[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="March 11, 2003" +UPDATED="September 10, 2003" AC_SUBST(UPDATED) AC_CONFIG_HEADERS(engine/config.h) #suppress the "-g -O2" default test "$CFLAGS" || CFLAGS=-O2 -#default setting that may be changed later: -test "$no_dynamic_default" || no_dynamic_default=0 - AC_ARG_ENABLE(force-reg, -[ --enable-force-reg Use explicit register declarations if they appear in + AC_HELP_STRING([--enable-force-reg], + [ Use explicit register declarations if they appear in + the machine.h file. This can cause a good speedup, + but also incorrect code with some gcc versions on + some processors (default disabled).]), + ,enable_force_reg=no) +test "$enable_force_reg" = "no"|| + AC_DEFINE(FORCE_REG,,[Define if you want to use explicit register declarations for better performance or for more convenient CODE words (does not work with all GCC versions on all machines)]) + +AC_ARG_ENABLE(force-ll, + AC_HELP_STRING([--enable-force-ll], + [ Use explicit long long declarations if they appear in the machine.h file. This can cause a good speedup, but also incorrect code with some gcc versions on - some processors (default disabled).], -AC_DEFINE(FORCE_REG,,[Define if you want to use explicit register declarations for better performance or for more convenient CODE words (does not work with all GCC versions on all machines)])) + some processors (default disabled).]), + ,enable_force_ll=no) +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 + floored division (default disabled).]), + ,enable_force_cdiv=no) +test "$enable_force_cdiv" = "no"|| + AC_DEFINE(FORCE_CDIV,,[Define if you want to use explicit symmetric division for better performance]) + +AC_SUBST(PROFEXES) +AC_SUBST(PROFOBJS) +AC_ARG_ENABLE(prof, + AC_HELP_STRING([--enable-prof], + [ Build gforth-prof, which outputs frequently occuring + sequences of primitives.]), + ,enable_prof=no) +if test "$enable_prof" = "no"; then + PROFEXES="gforth-prof\$(EXE)"; PROFOBJS="engine-prof.o main-prof.o profile.o" +fi AC_ARG_WITH(debug, [ --with-debug specifies option -g to compile with debug info @@ -68,8 +108,10 @@ AC_ARG_VAR(ac_cv_sizeof_long, [sizeof(lo AC_ARG_VAR(ac_cv_sizeof_long_long, [sizeof(long long)]) AC_ARG_VAR(ac_cv_sizeof_intptr_t, [sizeof(intptr_t)]) AC_ARG_VAR(ac_cv_sizeof_int128_t, [sizeof(int128_t)]) +AC_ARG_VAR(ac_cv_sizeof_uint128_t, [sizeof(uint128_t)]) 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(skip_code, [assembly code for skipping 16 bytes of code]) #set up feature test macros, so the tests get them right: # turn on all POSIX, SUSv3, and GNU features if available @@ -97,15 +139,15 @@ test "$GCC" = "yes" || AC_MSG_ERROR(Gfor AC_SUBST(CC) AC_SUBST(DEBUGFLAG) -dnl gcc-3.2 seems to work fine now -dnl AC_MSG_CHECKING(gcc version) -dnl gcc_version=`$CC -v 2>&1|grep 'gcc version'|sed 's/.*gcc version //'` -dnl AC_MSG_RESULT($gcc_version) -dnl if expr "$gcc_version" \> 3.0.4 >/dev/null && expr "$gcc_version" \< 3.2.1 >/dev/null -dnl then -dnl no_dynamic_default=1 -dnl AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2)) -dnl fi +AC_MSG_CHECKING(make type) +make_type=`make -v 2>&1|grep 'ake version'|sed 's/ version .*//'` + +GNUMAKE='#' +test "$make_type" = "GNU Make" && GNUMAKE='' + +AC_MSG_RESULT($make_type) + +AC_SUBST(GNUMAKE) AC_MSG_CHECKING([whether the linker accepts -export-dynamic]) OLDLDFLAGS=$LDFLAGS @@ -120,11 +162,20 @@ AC_MSG_RESULT($ac_export_dynamic) #gforth will run; the system on which configure will run is the `build' AC_CANONICAL_HOST case "$host_cpu" in + arm*) + machine=arm + CFLAGS="$CFLAGS -fomit-frame-pointer" + if test -z $no_dynamic_default; then + no_dynamic_default=1 + AC_MSG_WARN([No I-cache flush code known, disabling dynamic native code generation]) + fi + ;; hppa*) machine=hppa $srcdir/mkinstalldirs arch/hppa AC_LIBOBJ(../arch/hppa/cache) - #LDFLAGS="$LDFLAGS -Xlinker -N" + #-N needed for --dynamic + LDFLAGS="$LDFLAGS -Xlinker -N" LIBS="$LIBS -L/lib/pa1.1/" ;; sparc*) @@ -145,10 +196,16 @@ case "$host_cpu" in CFLAGS="$CFLAGS -march=pentium" AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486") ;; -#generic should work for IA64 -# ia64*) -# machine=ia64 -# ;; + x86_64) + machine=amd64 + ;; + ia64*) + machine=ia64 + AC_LIBOBJ(../arch/ia64/flush_icache_block) + test "$skipcode" || skipcode="nop.i 0" + #".skip 16" passes the test below, + # but gives an assembler error in engine + ;; m68k) machine=m68k CFLAGS="$CFLAGS -fomit-frame-pointer" @@ -172,8 +229,10 @@ case "$host_cpu" in #particular, the delay slots of LW, MFLO, etc.) # #Therefore we disable dynamic native code by default: - no_dynamic_default=1 - AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2)) + if test -z $no_dynamic_default; then + no_dynamic_default=1 + AC_MSG_WARN([Disabling default dynamic native code generation (relocation and delay slot issues)]) + fi ;; alpha*) machine=alpha @@ -183,7 +242,7 @@ case "$host_cpu" in power*|rs6000) machine=power $srcdir/mkinstalldirs arch/power - AC_CHECK_FUNC(_sync_cache_range,true,AC_LIBOBJ(../arch/power/_sync_cache_range)) + AC_CHECK_FUNC(_sync_cache_range,[true],[AC_LIBOBJ(../arch/power/_sync_cache_range)]) #long long is broken on (at least) gcc-2.95.* for PPC test x$ac_cv_sizeof_long_long = x && ac_cv_sizeof_long_long=0 ;; @@ -193,11 +252,18 @@ case "$host_cpu" in AC_MSG_WARN([FLUSH-ICACHE will do nothing, so END-CODE may not work properly!]) machine=generic #I-cache flushing would be needed for dynamic code generation - no_dynamic_default=1 - AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2)) + if test -z $no_dynamic_default; then + no_dynamic_default=1 + AC_MSG_WARN([No I-cache flush code known, disabling dynamic native code generation]) + fi esac AC_SUBST(host) +if test "${enable_force_ll+set}" = set; then + ac_includes_default="$ac_includes_default +#include \"arch/generic/128bit.h\"" +fi + dnl the following macro produces a warning with autoconf-2.1 AC_CHECK_SIZEOF(char *) case "$ac_cv_sizeof_char_p" in @@ -219,6 +285,7 @@ AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(intptr_t) AC_CHECK_SIZEOF(int128_t) +AC_CHECK_SIZEOF(uint128_t) AC_MSG_CHECKING([for a C type for cells]) ac_cv_int_type_cell=none @@ -271,12 +338,40 @@ case `expr 2 '*' "$ac_cv_sizeof_char_p"` ;; esac AC_MSG_RESULT($ac_cv_int_type_double_cell) -if test "$ac_cv_int_type_double_cell" = none; then + +AC_MSG_CHECKING([for a C type for unsigned double-cells]) +ac_cv_int_type_double_ucell=none +case `expr 2 '*' "$ac_cv_sizeof_char_p"` in + $ac_cv_sizeof_short) + ac_cv_int_type_double_ucell="unsigned short" + ;; + $ac_cv_sizeof_int) + ac_cv_int_type_double_ucell="unsigned int" + ;; + $ac_cv_sizeof_long) + ac_cv_int_type_double_ucell="unsigned long" + ;; + $ac_cv_sizeof_long_long) + ac_cv_int_type_double_ucell="unsigned long long" + ;; + $ac_cv_sizeof_intptr_t) + ac_cv_int_type_double_ucell="unsigned intptr_t" + ;; + $ac_cv_sizeof_uint128_t) + ac_cv_int_type_double_ucell="uint128_t" + ;; +esac +AC_MSG_RESULT($ac_cv_int_type_double_ucell) + +if test "$ac_cv_int_type_double_cell" = none || \ + test "$ac_cv_int_type_double_ucell" = none +then AC_MSG_WARN([Emulating double-cell arithmetic. This may be slow.]) AC_LIBOBJ(dblsub) AC_DEFINE(BUGGY_LONG_LONG,,[define this if there is no working DOUBLE_CELL_TYPE on your machine]) else AC_DEFINE_UNQUOTED(DOUBLE_CELL_TYPE,$ac_cv_int_type_double_cell,[an integer type that is twice as long as a pointer]) + AC_DEFINE_UNQUOTED(DOUBLE_UCELL_TYPE,$ac_cv_int_type_double_ucell,[an unsigned integer type that is twice as long as a pointer]) fi AC_TYPE_OFF_T @@ -313,6 +408,20 @@ AC_TRY_COMPILE(,,ac_nocrossjumping=yes;E CFLAGS="$CFLAGS_1" AC_MSG_RESULT($ac_nocrossjumping) +# Try if GCC understands -fno-reorder-blocks +AC_MSG_CHECKING([if $CC understands -fno-reorder-blocks]) +CFLAGS_1="$CFLAGS" +CFLAGS="$CFLAGS -fno-reorder-blocks" +AC_TRY_COMPILE(,,ac_noreorder_blocks=yes;ENGINE_FLAGS="$ENGINE_FLAGS -fno-reorder-blocks",ac_noreorder_blocks=no) +CFLAGS="$CFLAGS_1" +AC_MSG_RESULT($ac_noreorder_blocks) + +# 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))',) +AC_DEFINE_UNQUOTED(MAYBE_UNUSED,$MAYBE_UNUSED,[attribute for possibly unused variables]) +AC_MSG_RESULT($MAYBE_UNUSED) + AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine) AC_SUBST(asm_fs) @@ -324,19 +433,34 @@ AC_PATH_PROG(INSTALL_INFO,install-info,[ case "$host_os" in *win32|cygwin) DIRSEP="\\\\" + PATHSEP=";" + #we want the builtins of command.com/cmd.exe and its + # handling of .com files. + #$COMSPEC contains the name of the Windows shell; + # the ./ is there, because the bash does not recognize + # absolute DOS filenames + DEFAULTSYSTEMPREFIX="./$COMSPEC /c " ;; *darwin*) #Darwin uses some funny preprocessor by default; eliminate it: - AC_MSG_NOTICE([using -traditional-cpp on Darwin]) + AC_MSG_NOTICE([using -no-cpp-precomp on Darwin]) CFLAGS="$CFLAGS -no-cpp-precomp" DIRSEP="/" + PATHSEP=":" + DEFAULTSYSTEMPREFIX="" ;; *) DIRSEP="/" + PATHSEP=":" + DEFAULTSYSTEMPREFIX="" ;; esac AC_SUBST(DIRSEP) AC_DEFINE_UNQUOTED(DIRSEP,'$DIRSEP',[a directory separator character]) +AC_SUBST(PATHSEP) +AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP',[a path separator character]) +AC_SUBST(DEFAULTSYSTEMPREFIX) +AC_DEFINE_UNQUOTED(DEFAULTSYSTEMPREFIX,"$DEFAULTSYSTEMPREFIX",[default for environment variable GFORTHSYSTEMPREFIX]) dnl Now a little support for DOS/DJGCC AC_SUBST(GFORTH_EXE) @@ -348,10 +472,6 @@ GFORTHITC_EXE="" AC_SUBST(GFORTHDITC_EXE) GFORTHDITC_EXE="" -PATHSEP=":" -AC_SUBST(PATHSEP) -AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP',[a path separator character]) - AC_SUBST(FORTHSIZES) dnl if test "$PEEPHOLE" = "yes" @@ -388,38 +508,53 @@ else fi #check how to do asm(".skip 16") +echo "CFLAGS=$CFLAGS" +echo "ac_link=$ac_link" AC_MSG_CHECKING([if and how we can waste code space]) -skipcode=no -for i in ".skip 16" ".block 16" ".org .+16" ".=.+16" ".space 16" -do +if test -z "$skipcode"; then + skipcode=no + CFLAGS_1="$CFLAGS" + CFLAGS="$CFLAGS $ENGINE_FLAGS" + for i in ".skip 16" ".block 16" ".org .+16" ".=.+16" ".space 16" + do AC_TRY_RUN( -int foo(int); +[int foo(int,int,int); main() { - exit(foo(0)!=16); + exit(foo(0,0,0)!=16); } -int foo(int x) +int foo(int x, int y, int z) { + static void *labels[]={&&label1, &&label2}; if (x) { + y++; /* workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12108 */ label1: - asm("$i"); - label2: + asm("$i"); /* or ".space 16" or somesuch */ + label2: ; } - return (&&label2)-(&&label1); -} + { + if (y) goto *labels[z]; /* workaround for gcc PR12108 */ + return labels[1]-labels[0]; + } +}] ,skipcode=$i; break ,,) -done + done + CFLAGS=$CFLAGS_1 +fi AC_MSG_RESULT($skipcode) if test "$skipcode" = no then - no_dynamic_default=1 + if test -z $no_dynamic_default; then + no_dynamic_default=1 + AC_MSG_WARN(Disabling default dynamic native code generation) + fi AC_DEFINE_UNQUOTED(SKIP16,((void)0),statement for skipping 16 bytes) - AC_MSG_WARN(Disabling dynamic native code generation by default (speed penalty factor ~2)) else AC_DEFINE_UNQUOTED(SKIP16,asm("$skipcode"),statement for skipping 16 bytes) fi +test "$no_dynamic_default" || no_dynamic_default=0 AC_DEFINE_UNQUOTED(NO_DYNAMIC_DEFAULT,$no_dynamic_default,default value for no_dynamic) dnl Checks for programs. @@ -438,8 +573,11 @@ AC_CHECK_LIB(callback,__vacall_r) AC_CHECK_LIB(vacall,vacall) AC_CHECK_LIB(trampoline,alloc_trampoline) FFCALLFLAG="false" -test $ac_cv_lib_avcall___builtin_avcall = yes && FFCALLFLAG="true" && AC_DEFINE(HAS_FFCALL,,[define this if you want to use the ffcall libraries]) +OLDCALLFLAG="true" +test $ac_cv_lib_avcall___builtin_avcall = yes && FFCALLFLAG="true" && OLDCALLFLAG="false" && AC_DEFINE(HAS_FFCALL,,[define this if you want to use the ffcall libraries]) +test $ac_cv_lib_avcall___builtin_avcall = no && AC_DEFINE(HAS_OLDCALL,,[define this if you want to use the old call libraries]) AC_SUBST(FFCALLFLAG) +AC_SUBST(OLDCALLFLAG) if test "$host_os" != "nextstep3" then AC_FUNC_MEMCMP @@ -449,7 +587,7 @@ AC_FUNC_FSEEKO AC_CHECK_FUNCS(ftello dlopen sys_siglist getrusage) AC_CHECK_TYPES(stack_t,,,[#include ]) AC_DECL_SYS_SIGLIST -AC_CHECK_FUNC(getopt_long,true,AC_LIBOBJ(getopt); AC_LIBOBJ(getopt1)) +AC_CHECK_FUNC(getopt_long,[true],[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)]) AC_CHECK_FUNCS(expm1 log1p) AC_REPLACE_FUNCS(rint ecvt) dnl No check for select, because our replacement is no good under