diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8992aa83001..c9753ca6217 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-11  Richard Henderson  <rth@redhat.com>
+
+	* dwarf2out.c (add_const_value_attribute): If long < HOST_WIDE_INT,
+	fall back to add_AT_long_long for large CONST_INT.
+
 2001-10-11  Richard Henderson  <rth@redhat.com>
 
 	* config/i386/i386.md (setcc splitters): Add four splitters to
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 275e5b41fb2..01613d95a51 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -8329,18 +8329,19 @@ add_const_value_attribute (die, rtl)
 	HOST_WIDE_INT val = INTVAL (rtl);
 	
 	/* ??? We really should be using HOST_WIDE_INT throughout.  */
-	if (val < 0)
+	if (val < 0 && (long) val == val)
 	  {
 	    if ((long) val != val)
 	      abort ();
 	    add_AT_int (die, DW_AT_const_value, (long) val);
 	  }
+	else if ((unsigned long) val == (unsigned HOST_WIDE_INT) val)
+	  add_AT_unsigned (die, DW_AT_const_value, (unsigned long) val);
+	else if (2*HOST_BITS_PER_LONG == HOST_BITS_PER_WIDE_INT)
+	  add_AT_long_long (die, DW_AT_const_value,
+			    val >> HOST_BITS_PER_LONG, val);
 	else
-	  {
-	    if ((unsigned long) val != (unsigned HOST_WIDE_INT) val)
-	      abort ();
-	    add_AT_unsigned (die, DW_AT_const_value, (unsigned long) val);
-	  }
+	  abort ();
       }
       break;