diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 8b3f0f32618..e24378d6128 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-22  David S. Miller  <davem@redhat.com>
+
+	* include/private/gcconfig.h: Hard-code STACKBOTTOM on
+	64-bit SPARC Linux, the __libc_stack_end technique does
+	not work in this case.
+
+2002-04-22  Jeff Sturm  <jsturm@one-point.com>
+
+	* gcconfig.h: Enable DYNAMIC_LOADING for all sparc-solaris ABIs.
+
 2002-04-17  Hans Boehm  <Hans_Boehm@hp.com>
 
 	* include/private/gcconfig.h: Use LINUX_STACKBOTTOM for
diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h
index c4a522d4216..70eee489d64 100644
--- a/boehm-gc/include/private/gcconfig.h
+++ b/boehm-gc/include/private/gcconfig.h
@@ -777,9 +777,7 @@
 #       define GETPAGESIZE()  sysconf(_SC_PAGESIZE)
 		/* getpagesize() appeared to be missing from at least one */
 		/* Solaris 5.4 installation.  Weird.			  */
-#       if CPP_WORDSZ == 32
-#	  define DYNAMIC_LOADING
-#    	endif
+#	define DYNAMIC_LOADING
 #   endif
 #   ifdef SUNOS4
 #	define OS_TYPE "SUNOS4"
@@ -820,10 +818,12 @@
       extern int _etext[];
 #     define DATAEND (_end)
 #     define SVR4
-#     define LINUX_STACKBOTTOM
 #     ifdef __arch64__
+	/* libc_stack_end is not set reliably for sparc64 */
+#       define STACKBOTTOM ((ptr_t) 0x80000000000)
 #	define DATASTART (ptr_t)GC_SysVGetDataStart(0x100000, _etext)
 #     else
+#       define LINUX_STACKBOTTOM
 #	define DATASTART (ptr_t)GC_SysVGetDataStart(0x10000, _etext)
 #     endif
 #   endif