diff --git a/src/base/compiler.hh b/src/base/compiler.hh
index 36aa13e716..29375c1900 100644
--- a/src/base/compiler.hh
+++ b/src/base/compiler.hh
@@ -80,16 +80,6 @@
 #  define GEM5_LIKELY(cond) __builtin_expect(!!(cond), 1)
 #  define GEM5_UNLIKELY(cond) __builtin_expect(!!(cond), 0)
 
-// Mark a C++ emum value as deprecated, with a message explaining what to do
-// to update to a non-deprecated alternative. This wraps GEM5_DEPRECATED but
-// is guarded by a preprocessor if directive to ensure it is not included
-// when compiled in GCC < 6, as deprecation of enum values was introduced in
-// GCC 6. All supported clang compilers allow enum value deprecation.
-#  if defined(__clang__) || __GNUC__ >= 6
-#    define GEM5_DEPRECATED_ENUM_VAL(message) [[deprecated(message)]]
-#  else
-#    define GEM5_DEPRECATED_ENUM_VAL(message)
-#  endif
 // Mark an expression-like macro as deprecated by wrapping it in some code
 // which declares and uses a deprecated variable with the same name as the
 // macro. The wrapping macro evaluates to the same thing as the original macro.
@@ -173,6 +163,10 @@ do { [[maybe_unused]] int i[] = { 0, ((void)(__VA_ARGS__), 0)... }; } while (0)
 #define GEM5_DEPRECATED(message) \
      [[deprecated(message " The GEM5_DEPRECATED macro is also deprecated, "\
              "please use the [[deprecated()]] attribute directly.")]]
+#define GEM5_DEPRECATED_ENUM_VAL(message) \
+     [[deprecated(message " The GEM5_DEPRECATED_ENUM_VAL macro is also "\
+             "deprecated, please use the [[deprecated()]] attribute "\
+             "directly.")]]
 
 // Deprecated attributes which can't be made to warn without possibly breaking
 // existing code.
diff --git a/src/sim/aux_vector.hh b/src/sim/aux_vector.hh
index 0a14effde9..bc100c541f 100644
--- a/src/sim/aux_vector.hh
+++ b/src/sim/aux_vector.hh
@@ -95,8 +95,8 @@ enum Type
 } // namespace auxv
 
 #define GEM5_DEPRECATE_AT(NAME, name) M5_AT_##NAME \
-    GEM5_DEPRECATED_ENUM_VAL(\
-        "Replace M5_AT_" #NAME " with gem5::auxv::" #name) = gem5::auxv::name
+    [[deprecated("Replace M5_AT_" #NAME " with gem5::auxv::" #name)]] = \
+    gem5::auxv::name
 
 enum AuxiliaryVectorType
 {
@@ -119,8 +119,8 @@ enum AuxiliaryVectorType
     GEM5_DEPRECATE_AT(HWCAP, Hwcap),
     GEM5_DEPRECATE_AT(CLKTCK, Clktck),
     GEM5_DEPRECATE_AT(SECURE, Secure),
-    M5_BASE_PLATFORM GEM5_DEPRECATED_ENUM_VAL(
-            "Replace M5_BASE_PLATFORM with gem5::auxv::BasePlatform") =
+    M5_BASE_PLATFORM [[deprecated(
+            "Replace M5_BASE_PLATFORM with gem5::auxv::BasePlatform")]] =
         gem5::auxv::BasePlatform,
     GEM5_DEPRECATE_AT(RANDOM, Random),
     GEM5_DEPRECATE_AT(HWCAP2, Hwcap2),