diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 0ab7edbc26e098f2670916d1f4f560d7ff9539e2..f46411a3caac2294f880e795c6eda9aa09ae3bda 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-30  Tom Tromey  <tromey@cygnus.com>
+
+	* gjavah.c (D_NAN_MASK): Only define as word-reversed when
+	HOST_FLOAT_WORDS_BIG_ENDIAN and HOST_WORDS_BIG_ENDIAN disagree.
+
 2000-03-28  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
 	* parse-scan.y (pop_class_context): Reset `inner_qualifier_length'
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 769eb77b3f2d354c011e77f51aa8c1215af665d2..41caf5c1a6d095ddaa64015df814b1ea13191f57 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -203,7 +203,7 @@ static int decompiled = 0;
 
 /* Some useful constants.  */
 #define F_NAN_MASK 0x7f800000
-#if (1 == HOST_FLOAT_WORDS_BIG_ENDIAN)
+#if (1 == HOST_FLOAT_WORDS_BIG_ENDIAN) && ! defined (HOST_WORDS_BIG_ENDIAN)
 #define D_NAN_MASK 0x000000007ff00000LL
 #else
 #define D_NAN_MASK 0x7ff0000000000000LL