From: Gabe Black <gabeblack@google.com>
Date: Sat, 14 Mar 2020 06:18:43 +0000 (-0700)
Subject: util: Remove the annotation pseudo ops symbols from the m5 utility.
X-Git-Tag: v20.0.0.0~230
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=412264912276073354d2ef73c13b5f79fe3b41e5;p=gem5.git

util: Remove the annotation pseudo ops symbols from the m5 utility.

These pseudo ops have been removed and will no longer work with gem5.

Change-Id: Ie07a320db528cb5c628f2c194fb1672b1fcae39a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27203
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
---

diff --git a/util/m5/m5op_arm.S b/util/m5/m5op_arm.S
index 2176ec6ef..c0487c01c 100644
--- a/util/m5/m5op_arm.S
+++ b/util/m5/m5op_arm.S
@@ -62,6 +62,3 @@
 .text
 #define M5OP(name, func, subfunc) m5op_func name, func, subfunc
         M5OP_FOREACH
-
-#define M5_ANNOTATION(name, ann) m5op_func name, M5OP_ANNOTATE, ann
-        M5OP_FOREACH_ANNOTATION
diff --git a/util/m5/m5op_arm_A64.S b/util/m5/m5op_arm_A64.S
index 76d6f19c4..09d31d3f0 100644
--- a/util/m5/m5op_arm_A64.S
+++ b/util/m5/m5op_arm_A64.S
@@ -61,6 +61,3 @@
 .text
 #define M5OP(name, func, subfunc) m5op_func name, func, subfunc
         M5OP_FOREACH
-
-#define M5_ANNOTATION(name, ann) m5op_func name, M5OP_ANNOTATE, ann
-        M5OP_FOREACH_ANNOTATION