--- gforth/configure.in 1999/03/12 18:37:54 1.51 +++ gforth/configure.in 2001/05/01 14:35:00 1.81 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -#Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. +#Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. #This file is part of Gforth. @@ -16,25 +16,24 @@ dnl Process this file with autoconf to p #You should have received a copy of the GNU General Public License #along with this program; if not, write to the Free Software -#Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. AC_INIT(engine/engine.c) dnl We use some automake macros here, dnl but don't use automake for creating Makefile.in -AM_INIT_AUTOMAKE(gforth,0.4.0-19990312) +AM_INIT_AUTOMAKE(gforth,0.5.9-20010501) #snapshots have numbers major.minor.release-YYYYMMDD #note that lexicographic ordering bust be heeded. #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1! AM_CONFIG_HEADER(engine/config.h) -AM_CYGWIN32 +#AM_CYGWIN32 AC_ARG_ENABLE(force-reg, [ --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).], - AC_DEFINE(FORCE_REG)) dnl this is not quite according to the autoconf manual, it causes a replacement AC_ARG_ENABLE(direct-threaded, @@ -55,6 +54,13 @@ AC_ARG_WITH(debug, debugging informations.], if test "$withval" = "yes"; then DEBUGFLAG=-g; fi) +PEEPHOLE="yes" +AC_ARG_WITH(peephole, +[ --with-peephole Enable peephole optimization (default) + --without-peephole disables peephole optimization. Creates smaller, + but slower images.], +PEEPHOLE="$withval") + CFLAGS=$CFLAGS AC_PROG_CC @@ -148,7 +154,9 @@ fi AC_MSG_CHECKING([whether the linker accepts -export-dynamic]) OLDLDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -export-dynamic" -AC_TRY_LINK(,,ac_export_dynamic=yes,ac_export_dynamic=no) +dnl AC_TRY_LINK gives false positive on rs6000-ibm-aix4.2.1.0 +dnl AC_TRY_LINK(,,ac_export_dynamic=yes,ac_export_dynamic=no) +AC_TRY_RUN(main(){exit(0);},ac_export_dynamic=yes,ac_export_dynamic=no,ac_export_dynamic=no) test $ac_export_dynamic = yes|| LDFLAGS=$OLDLDFLAGS AC_MSG_RESULT($ac_export_dynamic) @@ -190,16 +198,22 @@ case "$host_cpu" in AC_DEFINE(DIRECT_THREADED) fi ;; - i586|i686) + i*86) machine=386 - CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem -m486" + CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr -fforce-mem" + CFLAGS_1="$CFLAGS" + CFLAGS="$CFLAGS -mpentium" + AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486") if test "${enable_direct_threaded+set}" = "" \ -a "${enable_indirect_threaded+set}" = "" then - echo "Using indirect threaded code on Pentium and up" + echo "Using indirect threaded code on IA32 CPUs with split L1 caches" AC_DEFINE(INDIRECT_THREADED) fi ;; + ia64*) + machine=ia64 + ;; m68k) machine=m68k CFLAGS="$CFLAGS -fomit-frame-pointer" @@ -227,11 +241,25 @@ case "$host_cpu" in ;; alpha*) machine=alpha + #full IEEE FP support for more uniformity across platforms: + CFLAGS="$CFLAGS -mieee" ;; - power*) + power*|rs6000) machine=power $srcdir/mkinstalldirs arch/power AC_CHECK_FUNC(_sync_cache_range,true,LIBOBJS="$LIBOBJS ../arch/power/_sync_cache_range.o") + #link text segment into first 32MB + AC_MSG_CHECKING([whether the linker accepts --script=arch/power/elf32ppc.x]) + OLDLDFLAGS=$LDFLAGS + #the -L../$srcdir helps when $srcdir is relative + LDFLAGS="$LDFLAGS -L$srcdir -L../$srcdir -Xlinker --script=$srcdir/arch/power/elf32ppc.x" + AC_TRY_LINK(,,ac_link_script=yes,ac_link_script=no) + test $ac_link_script = yes||LDFLAGS=$OLDLDFLAGS + AC_MSG_RESULT($ac_link_script) + AC_MSG_CHECKING([whether the code is in the first 32MB]) + AC_TRY_RUN([main(){label: exit(((unsigned long)&&label)>32000000UL);}],ac_code_under_32=yes,ac_code_under_32=no,ac_code_under_32=no) + AC_MSG_RESULT($ac_code_under_32) + test $ac_code_under_32 = yes||(AC_MSG_WARN([Using indirect threading]); AC_DEFINE(INDIRECT_THREADED)) ;; *) echo "No direct threading support for $host_cpu, using indirect threading." @@ -244,6 +272,12 @@ esac AC_SUBST(host) AC_SUBST(ENGINE_FLAGS) +AC_CHECK_PROG(asm_fs,asm.fs,arch/$machine/asm.fs,,$srcdir/arch/$machine) +AC_SUBST(asm_fs) + +AC_CHECK_PROG(disasm_fs,disasm.fs,arch/$machine/disasm.fs,,$srcdir/arch/$machine) +AC_SUBST(disasm_fs) + case "$host_os" in *win32) EXE=".exe" @@ -268,6 +302,15 @@ AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP') AC_SUBST(FORTHSIZES) +if test "$PEEPHOLE" = "yes" +then + PEEPHOLEFLAG="true" + AC_DEFINE(HAS_PEEPHOLE) +else + PEEPHOLEFLAG="false" +fi +AC_SUBST(PEEPHOLEFLAG) + dnl copy commands for systems that don't have links AC_SUBST(LINK_KERNL) LINK_KERNL="" @@ -305,23 +348,26 @@ then AC_FUNC_MEMCMP fi AC_REPLACE_FUNCS(memmove strtoul pow10 strerror strsignal atanh) -AC_CHECK_FUNCS(dlopen sys_siglist) +AC_CHECK_FUNCS(dlopen sys_siglist getrusage) AC_DECL_SYS_SIGLIST AC_CHECK_FUNC(getopt_long,true,LIBOBJS="$LIBOBJS getopt.o getopt1.o") AC_CHECK_FUNCS(rint expm1 log1p) AC_REPLACE_FUNCS(ecvt) dnl No check for select, because our replacement is no good under dnl anything but DOS -AC_CHECK_HEADERS(sys/mman.h) +AC_CHECK_HEADERS(sys/mman.h fnmatch.h) +AC_FUNC_FNMATCH +test $ac_cv_func_fnmatch_works = yes || LIBOBJS="$LIBOBJS fnmatch.o" AC_CHECK_FUNCS(mmap sysconf getpagesize) AM_PATH_LISPDIR kernel_fi=kernl${wordsize}${bytesex}.fi AC_SUBST(kernel_fi) -dnl replace srource directory by absolute value -if test $srcdir = "."; then srcdir=`pwd` -fi +#this breaks bindists +#dnl replace srource directory by absolute value +#if test $srcdir = "."; then srcdir=`pwd` +#fi AC_SUBST(machine) dnl AC_LINK_FILES(arch/$machine,arch/machine) #no longer needed @@ -329,9 +375,12 @@ AC_OUTPUT([ Makefile Makedist gforthmi +vmgen +machpc.fs engine/Makefile doc/version.texi ], echo timestamp > stamp-h chmod +x gforthmi +chmod +x vmgen test -d kernel||mkdir kernel)