diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 54287b40b19..382d2fd9d54 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-21  Paul Brook  <paul@codesourcery.com>
+
+	* unwind-arm-common.inc: Handle ID3/4 unwinding data.
+
 2011-10-16  Uros Bizjak  <ubizjak@gmail.com>
 	    Eric Botcazou  <ebotcazou@adacore.com>
 
diff --git a/libgcc/unwind-arm-common.inc b/libgcc/unwind-arm-common.inc
index 04bfd8b7e57..0713056bd1d 100644
--- a/libgcc/unwind-arm-common.inc
+++ b/libgcc/unwind-arm-common.inc
@@ -583,7 +583,7 @@ __gnu_unwind_pr_common (_Unwind_State state,
       uws.words_left = 0;
       uws.bytes_left = 3;
     }
-  else
+  else if (id < 3)
     {
       uws.words_left = (uws.data >> 16) & 0xff;
       uws.data <<= 16;