diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca574c002ef..2a23c319a18 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-04  Tom de Vries  <tom@codesourcery.com>
+
+	* config/s390/s390.md ("addptrdi3", "addptrsi3"): Use INTVAL only on
+	CONST_INT.
+
 2014-06-04  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR tree-optimization/61385
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index b17c1fac875..5fdbdbe8604 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -5045,10 +5045,10 @@
 		 (match_operand:DI 2 "nonmemory_operand" "")))]
   "TARGET_64BIT"
 {
-  HOST_WIDE_INT c = INTVAL (operands[2]);
-
   if (GET_CODE (operands[2]) == CONST_INT)
     {
+      HOST_WIDE_INT c = INTVAL (operands[2]);
+
       if (!CONST_OK_FOR_CONSTRAINT_P (c, 'K', "K")
 	  && !CONST_OK_FOR_CONSTRAINT_P (c, 'O', "Os"))
         {
@@ -5071,10 +5071,10 @@
 		   (use (const_int 0))])]
   "!TARGET_64BIT"
 {
-  HOST_WIDE_INT c = INTVAL (operands[2]);
-
   if (GET_CODE (operands[2]) == CONST_INT)
     {
+      HOST_WIDE_INT c = INTVAL (operands[2]);
+
       if (!CONST_OK_FOR_CONSTRAINT_P (c, 'K', "K")
 	  && !CONST_OK_FOR_CONSTRAINT_P (c, 'O', "Os"))
         {