diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 06314eaed00..fce6036e027 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-02  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* resource.c (mark_referenced_resources): Look inside
+	UNSPEC_VOLATILEs and ASM_INPUTs.
+
 2008-07-02  Ian Lance Taylor  <iant@google.com>
 
 	* rtlanal.c (add_reg_note): New function.
diff --git a/gcc/resource.c b/gcc/resource.c
index 05308491f61..009fb6e609b 100644
--- a/gcc/resource.c
+++ b/gcc/resource.c
@@ -266,12 +266,9 @@ mark_referenced_resources (rtx x, struct resources *res,
       return;
 
     case UNSPEC_VOLATILE:
+    case TRAP_IF:
     case ASM_INPUT:
       /* Traditional asm's are always volatile.  */
-      res->volatil = 1;
-      return;
-
-    case TRAP_IF:
       res->volatil = 1;
       break;