diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index afbaed422e4230b734e9ee682cc85dea9b2af358..a00850ac657c95da3502cfecffa7cfad32f3055e 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-22  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* configure.ac (machdep): Use sparc_mach_dep.lo on
+	sparc64-sun-solaris2.* too.
+	(Solaris gcc optimization fix): Disable on sparc*-sun-solaris2.*.
+	* configure: Regenerate.
+
 2004-11-22  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	PR target/18444
diff --git a/boehm-gc/configure b/boehm-gc/configure
index ebf3bdd2f1a782ac471b405e0b011a3f11aea573..b950a0706c4fd345584dc9c93fd880ad85623baa 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -5768,7 +5768,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
     ;;
- sparc-sun-solaris2.*)
+ sparc*-sun-solaris2.*)
     machdep="sparc_mach_dep.lo"
     ;;
  ia64-*-*)
@@ -6446,7 +6446,7 @@ fi
 echo "$as_me:$LINENO: checking whether Solaris gcc optimization fix is necessary" >&5
 echo $ECHO_N "checking whether Solaris gcc optimization fix is necessary... $ECHO_C" >&6
 case "$host" in
- sparc-sun-solaris2*|*aix*)
+ *aix*)
     if test "$GCC" = yes; then
        echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac
index 53a71a394e6c59ad3e9bc0b0542d70a28d9f14eb..7d1c6e3df1b36b96e0c3b9452156a23cb7397903 100644
--- a/boehm-gc/configure.ac
+++ b/boehm-gc/configure.ac
@@ -336,7 +336,7 @@ case "$host" in
     machdep="sparc_mach_dep.lo"
     AC_DEFINE(SUNOS53_SHARED_LIB,1,[Avoid Solaris 5.3 dynamic library bug])
     ;;
- sparc-sun-solaris2.*)
+ sparc*-sun-solaris2.*)
     machdep="sparc_mach_dep.lo"
     ;;
  ia64-*-*)
@@ -378,10 +378,10 @@ fi
 
 dnl As of 4.13a2, the collector will not properly work on Solaris when
 dnl built with gcc and -O.  So we remove -O in the appropriate case.
-dnl
+dnl Not needed anymore on Solaris.
 AC_MSG_CHECKING(whether Solaris gcc optimization fix is necessary)
 case "$host" in
- sparc-sun-solaris2*|*aix*)
+ *aix*)
     if test "$GCC" = yes; then
        AC_MSG_RESULT(yes)
        new_CFLAGS=