--- gforth/configure.in 2003/12/07 23:05:30 1.137 +++ gforth/configure.in 2005/01/22 16:39:58 1.146 @@ -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. @@ -39,6 +39,12 @@ AC_ARG_ENABLE(force-reg, 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)])) +AC_ARG_ENABLE(force-ll, +[ --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_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_SUBST(PROFEXES) AC_SUBST(PROFOBJS) AC_ARG_ENABLE(prof, @@ -71,6 +77,7 @@ 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]) @@ -204,7 +211,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 ;; @@ -221,6 +228,11 @@ case "$host_cpu" in 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 @@ -242,6 +254,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 @@ -294,12 +307,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 @@ -362,6 +403,12 @@ 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: @@ -369,17 +416,20 @@ case "$host_os" in 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) @@ -500,7 +550,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