--- gforth/configure.in	2007/02/17 16:23:06	1.172
+++ gforth/configure.in	2007/03/19 12:54:41	1.177
@@ -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
@@ -114,6 +103,8 @@ fi
 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_char, [sizeof(char)])
 AC_ARG_VAR(ac_cv_sizeof_short, [sizeof(short)])
@@ -126,6 +117,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
@@ -154,14 +147,14 @@ AC_SUBST(CC)
 AC_SUBST(DEBUGFLAG)
 AC_SUBST(EC_MODE)
 
+#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 +173,16 @@ case "$host_cpu" in
 	arm*)
 		machine=arm
 		CFLAGS="$CFLAGS -fomit-frame-pointer"
-		if test -z $no_dynamic_default; then
+		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
@@ -280,6 +279,14 @@ test x$STACK_CACHE_DEFAULT_FAST = x && S
 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\""
@@ -636,6 +643,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)