[gcc r15-2261] aarch64: Move AARCH64_NUM_ISA_MODES definition

[Andrew Carlotti via Gcc-cvs]

https://gcc.gnu.org/g:f11692fbfd85e6d62ecdb07e5affb611b29a6715

commit r15-2261-gf11692fbfd85e6d62ecdb07e5affb611b29a6715
Author: Andrew Carlotti <andrew.carlo...@arm.com>
Date:   Fri May 3 16:09:27 2024 +0100

    aarch64: Move AARCH64_NUM_ISA_MODES definition
    
    AARCH64_NUM_ISA_MODES will be used within aarch64-opts.h in a later
    commit.
    
    gcc/ChangeLog:
    
            * config/aarch64/aarch64.h (DEF_AARCH64_ISA_MODE): Move to...
            * config/aarch64/aarch64-opts.h (DEF_AARCH64_ISA_MODE): ...here.

Diff:
---
 gcc/config/aarch64/aarch64-opts.h | 5 +++++
 gcc/config/aarch64/aarch64.h      | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gcc/config/aarch64/aarch64-opts.h 
b/gcc/config/aarch64/aarch64-opts.h
index a05c0d3ded1c..06a4fed38334 100644
--- a/gcc/config/aarch64/aarch64-opts.h
+++ b/gcc/config/aarch64/aarch64-opts.h
@@ -24,6 +24,11 @@
 
 #ifndef USED_FOR_TARGET
 typedef uint64_t aarch64_feature_flags;
+
+constexpr unsigned int AARCH64_NUM_ISA_MODES = (0
+#define DEF_AARCH64_ISA_MODE(IDENT) + 1
+#include "aarch64-isa-modes.def"
+);
 #endif
 
 /* The various cores that implement AArch64.  */
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
index fac1882bcb38..2be6dc4089b8 100644
--- a/gcc/config/aarch64/aarch64.h
+++ b/gcc/config/aarch64/aarch64.h
@@ -183,11 +183,6 @@ enum class aarch64_feature : unsigned char {
 
 constexpr auto AARCH64_FL_SM_STATE = AARCH64_FL_SM_ON | AARCH64_FL_SM_OFF;
 
-constexpr unsigned int AARCH64_NUM_ISA_MODES = (0
-#define DEF_AARCH64_ISA_MODE(IDENT) + 1
-#include "aarch64-isa-modes.def"
-);
-
 /* The mask of all ISA modes.  */
 constexpr auto AARCH64_FL_ISA_MODES
   = (aarch64_feature_flags (1) << AARCH64_NUM_ISA_MODES) - 1;