diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 78365ebb60f5331b16485a73d88a8db32a3ac6ee..2f4a1730aa9d06ce62725e4df7f21953ccdd1c2b 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-12  Richard Henderson  <rth@redhat.com>
+
+	* configure.in: Re-apply 2001-06-26 configure change.
+	* configure: Rebuild.
+
 2002-02-12  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
 	Imported GC 6.1 Alpha 3.
@@ -6,7 +11,7 @@
 
 2001-02-11  Adam Megacz <adam@xwt.org
 
-	* gcc/boehm-gc/configure.in: support for win32, saner
+	* configure.in: support for win32, saner
 	cross-compile options
 
 2001-02-08  Anthony Green  <green@redhat.com>
diff --git a/boehm-gc/configure b/boehm-gc/configure
index 6805af9e03a2ae7f0d13ee62460ca64a03810fc9..e2b4840c9d53d0069bb0a16ed9b6f268d208d9e3 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -2813,18 +2813,8 @@ esac
 
 machdep=
 case "$host" in
-# alpha_mach_dep.s assumes that pointers are not saved in fp registers.
-# Gcc on a 21264 can spill pointers to fp registers.  Oops.
-# alpha*-*-*)
-#    machdep="alpha_mach_dep.lo"
-#    ;;
- i?86-*-solaris2.[89]*)
-    cat >> confdefs.h <<\EOF
-#define SOLARIS25_PROC_VDB_BUG_FIXED 1
-EOF
-
-    ;;
- alpha-*-openbsd*)
+ alpha*-*-openbsd*)
+    machdep="alpha_mach_dep.lo"
     if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
        echo "configure: warning: OpenBSD/Alpha without dlopen(). Shared library support is disabled" 1>&2
        # Check whether --enable-shared or --disable-shared was given.
@@ -2851,6 +2841,15 @@ else
 fi
 
     fi
+    ;;
+ alpha*-*-*)
+    machdep="alpha_mach_dep.lo"
+    ;;
+ i?86-*-solaris2.[89]*)
+    cat >> confdefs.h <<\EOF
+#define SOLARIS25_PROC_VDB_BUG_FIXED 1
+EOF
+
     ;;
  mipstx39-*-elf*)
     machdep="mips_ultrix_mach_dep.lo"
diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in
index d22516c2f00afa61f118f3f01745518ad2eed198..155653dbf26f2bb530f74cd831909ee171d4de15 100644
--- a/boehm-gc/configure.in
+++ b/boehm-gc/configure.in
@@ -154,20 +154,19 @@ AC_SUBST(CXXINCLUDES)
 
 machdep=
 case "$host" in
-# alpha_mach_dep.s assumes that pointers are not saved in fp registers.
-# Gcc on a 21264 can spill pointers to fp registers.  Oops.
-# alpha*-*-*)
-#    machdep="alpha_mach_dep.lo"
-#    ;;
- i?86-*-solaris2.[[89]]*)
-    AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED)
-    ;;
- alpha-*-openbsd*)
+ alpha*-*-openbsd*)
+    machdep="alpha_mach_dep.lo"
     if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
        AC_MSG_WARN(OpenBSD/Alpha without dlopen(). Shared library support is disabled)
        AM_DISABLE_SHARED
     fi
     ;;
+ alpha*-*-*)
+    machdep="alpha_mach_dep.lo"
+    ;;
+ i?86-*-solaris2.[[89]]*)
+    AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED)
+    ;;
  mipstx39-*-elf*)
     machdep="mips_ultrix_mach_dep.lo"
     AC_DEFINE(STACKBASE, __stackbase)