diff --git a/util/m5/m5op_arm.S b/util/m5/m5op_arm.S
index b4f7fb3cca..bd3bb4dc61 100644
--- a/util/m5/m5op_arm.S
+++ b/util/m5/m5op_arm.S
@@ -62,3 +62,4 @@
 .text
 #define M5OP(name, func) m5op_func name, func
         M5OP_FOREACH
+#undef M5OP
diff --git a/util/m5/m5op_arm_A64.S b/util/m5/m5op_arm_A64.S
index 011da0af6c..c0224e21b0 100644
--- a/util/m5/m5op_arm_A64.S
+++ b/util/m5/m5op_arm_A64.S
@@ -61,3 +61,4 @@
 .text
 #define M5OP(name, func) m5op_func name, func
         M5OP_FOREACH
+#undef M5OP