diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2bddaa38c9c..998fd5dbcd2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-13  J. David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* vax.h (INDEX_TERM_P): Define evaluation order of &&'s in || and
+	cast to squelch signed/unsigned warnings.
+
 2000-06-13  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* cpplib.c (handle_directive): Print non-NUL-terminated string
diff --git a/gcc/config/vax/vax.h b/gcc/config/vax/vax.h
index bfa4e6908e0..8dddaf3701b 100644
--- a/gcc/config/vax/vax.h
+++ b/gcc/config/vax/vax.h
@@ -731,15 +731,15 @@ enum reg_class { NO_REGS, ALL_REGS, LIM_REG_CLASSES };
  : (GET_CODE (PROD) == MULT						\
     &&									\
     (xfoo0 = XEXP (PROD, 0), xfoo1 = XEXP (PROD, 1),			\
-     ((GET_CODE (xfoo0) == CONST_INT					\
-       && INTVAL (xfoo0) == GET_MODE_SIZE (MODE)			\
-       && GET_CODE (xfoo1) == REG					\
-       && REG_OK_FOR_INDEX_P (xfoo1))					\
-      ||								\
-      (GET_CODE (xfoo1) == CONST_INT					\
-       && INTVAL (xfoo1) == GET_MODE_SIZE (MODE)			\
-       && GET_CODE (xfoo0) == REG					\
-       && REG_OK_FOR_INDEX_P (xfoo0))))))
+     ((((GET_CODE (xfoo0) == CONST_INT					\
+         && GET_CODE (xfoo1) == REG)					\
+         && INTVAL (xfoo0) == (int)GET_MODE_SIZE (MODE))		\
+         && REG_OK_FOR_INDEX_P (xfoo1))					\
+        ||								\
+      (((GET_CODE (xfoo1) == CONST_INT					\
+         && GET_CODE (xfoo0) == REG)					\
+         && INTVAL (xfoo1) == (int)GET_MODE_SIZE (MODE))		\
+         && REG_OK_FOR_INDEX_P (xfoo0))))))
 
 /* Go to ADDR if X is the sum of a register
    and a valid index term for mode MODE.  */