diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb8c21b5aab..840153d7d74 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-19  Jim Wilson  <wilson@cygnus.com>
+
+	* config/ia64/ia64.h (HARD_REGNO_MODE_OK): Don't allow XFmode in
+	GR_REGS.
+
 2000-07-19  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* tradcpp.c (rescan): Do not recognize directives when the #
diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index be94fc016ec..1d64e53a34b 100644
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -810,10 +810,11 @@ while (0)
 /* A C expression that is nonzero if it is permissible to store a value of mode
    MODE in hard register number REGNO (or in several registers starting with
    that one).  */
-/* ??? movxf_internal does not support XFmode values in integer registers.  */
+
 #define HARD_REGNO_MODE_OK(REGNO, MODE) \
   (FR_REGNO_P (REGNO) ? (MODE) != CCmode				\
    : PR_REGNO_P (REGNO) ? (MODE) == CCmode				\
+   : GR_REGNO_P (REGNO) ? (MODE) != XFmode				\
    : 1)
 
 /* A C expression that is nonzero if it is desirable to choose register