https://gcc.gnu.org/g:931131603c0563365105feb0613079e1a9e1ca23
commit 931131603c0563365105feb0613079e1a9e1ca23
Author: Michael Meissner <meiss...@linux.ibm.com>
Date: Wed Jul 31 14:32:02 2024 -0400
Move ARCH_* to rs6000.h.
2024-07-31 Michael Meissner <meiss...@linux.ibm.com>
gcc/
* config/rs6000/rs6000-opts.h: Move ARCH_* stuff from here.
* config/rs6000/rs6000.h: Move ARCH_* stuff here.
Diff:
---
gcc/config/rs6000/rs6000-opts.h | 20 --------------------
gcc/config/rs6000/rs6000.h | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/gcc/config/rs6000/rs6000-opts.h b/gcc/config/rs6000/rs6000-opts.h
index c7764e66cd03..f61cf7d1f662 100644
--- a/gcc/config/rs6000/rs6000-opts.h
+++ b/gcc/config/rs6000/rs6000-opts.h
@@ -71,26 +71,6 @@ enum processor_type
PROCESSOR_TITAN
};
-/* Define an enumeration to number the architecture masks. */
-#undef ARCH_EXPAND
-#define ARCH_EXPAND(PROC, NAME) ARCH_ENUM_ ## PROC,
-
-enum {
-#include "rs6000-arch.def"
- ARCH_ENUM_LAST
-};
-
-/* Create an architecture mask for the newer architectures (power6 and
- up).. */
-#undef ARCH_EXPAND
-#define ARCH_EXPAND(PROC, NAME)
\
- static const HOST_WIDE_INT ARCH_MASK_ ## PROC
\
- = HOST_WIDE_INT_1 << ARCH_ENUM_ ## PROC;
-
-#include "rs6000-arch.def"
-
-#undef ARCH_EXPAND
-
/* Types of costly dependences. */
enum rs6000_dependence_cost
{
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index ccf6a4201542..f011fa2523c0 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -2487,3 +2487,27 @@ while (0)
issues have been resolved. */
#define RS6000_DISABLE_SCALAR_MODULO 1
+
+
+/* Create the architecture flags. */
+/* Define an enumeration to number the architecture masks. */
+#ifdef GCC_HWINT_H
+#undef ARCH_EXPAND
+#define ARCH_EXPAND(PROC, NAME) ARCH_ENUM_ ## PROC,
+
+enum {
+#include "rs6000-arch.def"
+ ARCH_ENUM_LAST
+};
+
+/* Create an architecture mask for the newer architectures (power6 and
+ up).. */
+#undef ARCH_EXPAND
+#define ARCH_EXPAND(PROC, NAME)
\
+ static const HOST_WIDE_INT ARCH_MASK_ ## PROC
\
+ = HOST_WIDE_INT_1 << ARCH_ENUM_ ## PROC;
+
+#include "rs6000-arch.def"
+
+#undef ARCH_EXPAND
+#endif /* GCC_HWINT_H. */
