diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 1e39307bfa7..2114ef3d98e 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-28  Richard Earnshaw  <rearnsha@arm.com>
+
+	* include/private/gcconfig.h: Don't check for __XSCALE__.  Instead 
+	check for __arm__ or __thumb__.
+
 2002-09-27  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* include/private/gcconfig: Add machine type S390.  Add s390x support.
diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h
index 432250cf4f6..00ff9ef6a87 100644
--- a/boehm-gc/include/private/gcconfig.h
+++ b/boehm-gc/include/private/gcconfig.h
@@ -44,7 +44,7 @@
 # endif
 
 /* Determine the machine type: */
-# if defined(__XSCALE__)
+# if defined(__arm__) || defined(__thumb__)
 #    define ARM32
 #    if !defined(LINUX)
 #      define NOSYS