--- gforth/configure.in	2007/06/24 16:02:23	1.191
+++ gforth/configure.in	2007/06/30 17:52:22	1.193
@@ -254,7 +254,18 @@ case "$host_cpu" in
 		AC_TRY_COMPILE(,,,CFLAGS="$CFLAGS_1 -m486")
 		;;
 	x86_64)
-		machine=amd64
+		case $CC
+		in
+		    *-m32*)
+		    	machine=386
+			CFLAGS="$CFLAGS -fomit-frame-pointer -fforce-addr"
+			CFLAGS_1="$CFLAGS"
+			CFLAGS="$CFLAGS -march=athlon64"
+			;;
+		    *)
+		    	machine=amd64
+			;;
+		esac
 		;;
 	ia64*)
 		machine=ia64
@@ -584,6 +595,22 @@ AC_TRY_COMPILE(,,ac_noreorder_blocks=yes
 CFLAGS="$CFLAGS_1"
 AC_MSG_RESULT($ac_align_labels)
 
+# Try if GCC understands -falign-loops=1
+AC_MSG_CHECKING([if $CC understands -falign-loops=1])
+CFLAGS_1="$CFLAGS"
+CFLAGS="$CFLAGS -falign-loops=1"
+AC_TRY_COMPILE(,,ac_noreorder_blocks=yes;ENGINE_FLAGS="$ENGINE_FLAGS -falign-loops=1",ac_align_loops=no)
+CFLAGS="$CFLAGS_1"
+AC_MSG_RESULT($ac_align_loops)
+
+# Try if GCC understands -falign-jumps=1
+AC_MSG_CHECKING([if $CC understands -falign-jumps=1])
+CFLAGS_1="$CFLAGS"
+CFLAGS="$CFLAGS -falign-jumps=1"
+AC_TRY_COMPILE(,,ac_noreorder_blocks=yes;ENGINE_FLAGS="$ENGINE_FLAGS -falign-jumps=1",ac_align_jumps=no)
+CFLAGS="$CFLAGS_1"
+AC_MSG_RESULT($ac_align_jumps)
+
 # 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))',)