diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 31f95abbf6d..8d394ca98b7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-22  Andrew Haley  <aph@redhat.com>
+
+        * x86_64-signal.h: Add simple handler for x86_64 32-bit mode.
+        * configure.host (CHECKREFSPEC): Define for x86_64.
+
 2003-01-21  Tom Tromey  <tromey@redhat.com>
 
 	* java/util/natResourceBundle.cc (getCallingClassLoader): Start
diff --git a/libjava/configure.host b/libjava/configure.host
index 40e4e38590a..3736ef4e9d1 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -86,6 +86,7 @@ case "${host}" in
  	enable_getenv_properties_default=no
 	;;
   i686-*|i586-*|i486-*|i386-*)
+      CHECKREFSPEC="%{m32:-fcheck-references}"
 	sysdeps_dir=i386
 	libgcj_flags="${libgcj_flags} -ffloat-store"
 	libgcj_interpreter=yes
diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h
index c368dd31e87..b5bb8236f10 100644
--- a/libjava/include/x86_64-signal.h
+++ b/libjava/include/x86_64-signal.h
@@ -16,6 +16,8 @@ details.  */
 #include <signal.h>
 #include <sys/syscall.h>
 
+#ifdef __x86_64__
+
 #define HANDLE_SEGV 1
 
 #define SIGNAL_HANDLER(_name)	\
@@ -79,5 +81,16 @@ while (0)
  * go away if all systems ever have pthreads libraries that are
  * compiled with unwind info.  */
 
+#else /* __x86_64__ */
+
+/* This is for the 32-bit subsystem on on x86-64.  Catching signals
+   doesn't yet work on that target.  */
+
+#undef HANDLE_SEGV
+#undef HANDLE_FPE
+
+#define INIT_SEGV   do {} while (0)
+#define INIT_FPE   do {} while (0)
+
+#endif /* __x86_64__ */
 #endif /* JAVA_SIGNAL_H */
-