diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 17a59b63055519728e7df9e2b1a09f30ad351a48..24b4d358084372e1b557214db38b60f6e5f86e19 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-17  David Daney  <ddaney@avtrex.com>
+
+	* configure.ac: Don't define NO_SIGSET and NO_DEBUGGING while
+	cross-compiling.
+	* configure: Regenerated.
+	* include/gc_config.h.in: Regenerated.
+
 2007-01-17  Mike Stump  <mrs@apple.com>
 
 	* os_dep.c: Fix i686-apple-darwin9 builds.
diff --git a/boehm-gc/configure b/boehm-gc/configure
index 0d44e6bf139a638512fa7c512f5de58fff6b4a90..8d34fbdf1e68d5c90a7f6ff86273fa77072d5dd1 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -7624,19 +7624,6 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
-if test -n "${with_cross_host}"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_SIGSET 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_DEBUGGING 1
-_ACEOF
-
-fi
-
 # Check whether --enable-gc-debug or --disable-gc-debug was given.
 if test "${enable_gc_debug+set}" = set; then
   enableval="$enable_gc_debug"
diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac
index 2beaa1c188b5e113b6f13cbd04f1f8508638182a..afc014d795d47e2501b9070fe99363630a3e32af 100644
--- a/boehm-gc/configure.ac
+++ b/boehm-gc/configure.ac
@@ -488,14 +488,6 @@ AC_DEFINE(JAVA_FINALIZATION,1,[make it somewhat safer to finalize objects out of
 AC_DEFINE(GC_GCJ_SUPPORT,1,[include support for gcj])
 AC_DEFINE(ATOMIC_UNCOLLECTABLE,1,[include code for GC_malloc_atomic_uncollectable])
 
-dnl This is something of a hack.  When cross-compiling we turn off
-dnl some functionality. These is only correct when targetting an
-dnl embedded system.  FIXME.
-if test -n "${with_cross_host}"; then
-   AC_DEFINE(NO_SIGSET,1,[use empty GC_disable_signals and GC_enable_signals])
-   AC_DEFINE(NO_DEBUGGING,1,[removes GC_dump])
-fi
-
 AC_ARG_ENABLE(gc-debug,
 [  --enable-gc-debug	include full support for pointer backtracing etc.],
 [ if test "$enable_gc_debug" = "yes"; then
diff --git a/boehm-gc/include/gc_config.h.in b/boehm-gc/include/gc_config.h.in
index ef907ae127cb1421350a7bafa94a87691090408f..b754e33a6d17300c74edca33e349464204ecec9b 100644
--- a/boehm-gc/include/gc_config.h.in
+++ b/boehm-gc/include/gc_config.h.in
@@ -117,9 +117,6 @@
 /* Enable GC_PRINT_BACK_HEIGHT environment variable */
 #undef MAKE_BACK_GRAPH
 
-/* removes GC_dump */
-#undef NO_DEBUGGING
-
 /* cause some or all of the heap to not have execute permission */
 #undef NO_EXECUTE_PERMISSION
 
@@ -129,9 +126,6 @@
 /* does not disable signals */
 #undef NO_SIGNALS
 
-/* use empty GC_disable_signals and GC_enable_signals */
-#undef NO_SIGSET
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT