diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 66b9b0f800a..aaa88074047 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* dwarf2out.c (mem_loc_descriptor): Don't ICE on
+	{S,U}S_{PLUS,MINUS,NEG,ABS,ASHIFT}.
+
 2010-01-17  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/42248
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 11a496034a4..b78c2cc0a33 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -13438,12 +13438,21 @@ mem_loc_descriptor (rtx rtl, enum machine_mode mode,
       /* In theory, we could implement the above.  */
       /* DWARF cannot represent the unsigned compare operations
 	 natively.  */
-    case SS_TRUNCATE:
-    case US_TRUNCATE:
     case SS_MULT:
     case US_MULT:
     case SS_DIV:
     case US_DIV:
+    case SS_PLUS:
+    case US_PLUS:
+    case SS_MINUS:
+    case US_MINUS:
+    case SS_NEG:
+    case US_NEG:
+    case SS_ABS:
+    case SS_ASHIFT:
+    case US_ASHIFT:
+    case SS_TRUNCATE:
+    case US_TRUNCATE:
     case UDIV:
     case UMOD:
     case UNORDERED: