From 38897958864b51c386de6f649e262d1b9cf22d58 Mon Sep 17 00:00:00 2001
From: Gabe Black <gabe.black@gmail.com>
Date: Sat, 8 May 2021 22:19:21 -0700
Subject: [PATCH] arch-sparc: Replace M5_HWCAP_SPARC_* constants.

These were not using correct style and were using an obsolete M5 prefix.

Change-Id: I24273857bee2fcf52f203262b431c23665d5e87f
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45244
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
---
 src/arch/sparc/process.cc | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index 791ade67e1..b2eece7f21 100644
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -153,26 +153,26 @@ SparcProcess::argsInit(int pageSize)
     // maintain double word alignment of the stack pointer.
     uint64_t align = 16;
 
-    enum hardwareCaps
+    enum HardwareCaps
     {
-        M5_HWCAP_SPARC_FLUSH = 1,
-        M5_HWCAP_SPARC_STBAR = 2,
-        M5_HWCAP_SPARC_SWAP = 4,
-        M5_HWCAP_SPARC_MULDIV = 8,
-        M5_HWCAP_SPARC_V9 = 16,
+        HwcapSparcFlush = 1,
+        HwcapSparcStbar = 2,
+        HwcapSparcSwap = 4,
+        HwcapSparcMuldiv = 8,
+        HwcapSparcV9 = 16,
         // This one should technically only be set
         // if there is a cheetah or cheetah_plus tlb,
         // but we'll use it all the time
-        M5_HWCAP_SPARC_ULTRA3 = 32
+        HwcapSparcUltra3 = 32
     };
 
     const int64_t hwcap =
-        M5_HWCAP_SPARC_FLUSH |
-        M5_HWCAP_SPARC_STBAR |
-        M5_HWCAP_SPARC_SWAP |
-        M5_HWCAP_SPARC_MULDIV |
-        M5_HWCAP_SPARC_V9 |
-        M5_HWCAP_SPARC_ULTRA3;
+        HwcapSparcFlush |
+        HwcapSparcStbar |
+        HwcapSparcSwap |
+        HwcapSparcMuldiv |
+        HwcapSparcV9 |
+        HwcapSparcUltra3;
 
     // Setup the auxilliary vectors. These will already have endian conversion.
     // Auxilliary vectors are loaded only for elf formatted executables.