From 798403b6896ba55c55ef3238f61c7bff962dc439 Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Thu, 10 May 2012 18:04:26 -0500
Subject: [PATCH] ARM: Update m5op assembly for thumb compilation.

---
 util/m5/m5op_arm.S | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/util/m5/m5op_arm.S b/util/m5/m5op_arm.S
index 8cdf5c62d..7f43ef508 100644
--- a/util/m5/m5op_arm.S
+++ b/util/m5/m5op_arm.S
@@ -41,14 +41,26 @@
  *          Ali Saidi
  *          Chander Sudanthi
  */
+.syntax unified
+#ifdef __thumb__
+.thumb
+#endif
 
 #define m5_op 0xEE
 
 #include "m5ops.h"
 
+#ifdef __thumb__
+#define INST(op, ra, rb, func)                          \
+        .short (((op) << 8) | (func));                  \
+        .short (((ra) << 12) | (0x1 << 8) | (0x1 << 4) | (rb))
+/*               m5ops           m5func         */
+/*                ra         coproc 1       op=1       rb   */
+#else
 #define INST(op, ra, rb, func) \
         .long (((op) << 24) | ((func) << 16) | ((ra) << 12) | (0x1 << 8) | (0x1 << 4) | (rb))
 /*               m5ops           m5func             ra         coproc 1       op=1       rb   */
+#endif
 
 #define LEAF(func)    \
         .globl  func; \