diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 60bed9f851b..82c01b680f2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 11 17:38:40 1999  Jim Wilson  <wilson@cygnus.com>
+
+	* i960/i960.h (OVERRIDE_OPTIONS): Warn if -mlong-double-64 is used.
+	(LONG_DOUBLE_TYPE_SIZE): Undef then unconditionally define to 96.
+
 Thu Feb 11 15:11:35 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* mn10200.md (bset); Re-enable.
diff --git a/gcc/config/i960/i960.h b/gcc/config/i960/i960.h
index f433b4c6cdf..338e6801ec5 100644
--- a/gcc/config/i960/i960.h
+++ b/gcc/config/i960/i960.h
@@ -321,6 +321,9 @@ extern int target_flags;
       flag_signed_char = 1;					\
       target_flags |= TARGET_FLAG_CLEAN_LINKAGE;		\
     }								\
+  /* ??? See the LONG_DOUBLE_TYPE_SIZE definition below.  */	\
+  if (TARGET_LONG_DOUBLE_64)					\
+    warning ("The -mlong-double-64 option does not work yet.", 0);\
   i960_initialize ();						\
 }
 
@@ -369,6 +372,10 @@ extern int target_flags;
    ROUND_TYPE_ALIGN adjust the alignment for speed. */
 #define	LONG_DOUBLE_TYPE_SIZE (TARGET_LONG_DOUBLE_64 ? 64 : 96)
 
+/* ??? This must be a constant, because real.c and real.h test it with #if.  */
+#undef LONG_DOUBLE_TYPE_SIZE
+#define LONG_DOUBLE_TYPE_SIZE 96
+
 /* Define this to set long double type size to use in libgcc2.c, which can
    not depend on target_flags.  */
 #if defined(__LONG_DOUBLE_64__)