Merge, from trunk, r14549

14549  DRD: Handle Imbe_CancelReservation properly (clrex on ARM)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14746

diff --git a/drd/drd_load_store.c b/drd/drd_load_store.c
index 973bdda925ecc4e180cfe3eee504995c654025c8..afb88e16fd20e3de68bdf5dcc1df92053fd5cc94 100644 (file)
--- a/drd/drd_load_store.c
+++ b/drd/drd_load_store.c
@@ -633,7 +633,9 @@ IRSB* DRD_(instrument)(VgCallbackClosure* const closure,
          switch (st->Ist.MBE.event)
          {
          case Imbe_Fence:
-            break; /* not interesting */
+            break; /* not interesting to DRD */
+         case Imbe_CancelReservation:
+            break; /* not interesting to DRD */
          default:
             tl_assert(0);
          }