From e88a4b9f2cbb9ac90625c2d4026d1b0e68587ebb Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 24 Jun 2026 11:15:56 -0400
Subject: [PATCH] Sunway: Detect sw_64 architecture more consistently

Revise commit cfbf0480ff (Sunway: Add sw_64 support, 2025-08-05,
v4.2.0-rc1~373^2) to use the same set of preprocessor definitions for
all languages, and to order them consistently w.r.t. other archs.
---
 Modules/CMakeCompilerABI.h          | 4 ++--
 Modules/CMakeFortranCompilerABI.F   | 4 ++--
 Modules/CMakeFortranCompilerABI.F90 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Modules/CMakeCompilerABI.h b/Modules/CMakeCompilerABI.h
index bd90ea241c..42342c9d6b 100644
--- a/Modules/CMakeCompilerABI.h
+++ b/Modules/CMakeCompilerABI.h
@@ -114,8 +114,6 @@ static unsigned short const info_byte_order_little_endian[] = {
 #  define ARCHITECTURE_ID "riscv64"
 #elif defined(__riscv) && __riscv_xlen == 32
 #  define ARCHITECTURE_ID "riscv32"
-#elif defined(__sw_64)
-#  define ARCHITECTURE_ID "sw_64"
 #elif defined(__s390x__)
 #  define ARCHITECTURE_ID "s390x"
 #elif defined(__s390__)
@@ -124,6 +122,8 @@ static unsigned short const info_byte_order_little_endian[] = {
 #  define ARCHITECTURE_ID "sparcv9"
 #elif defined(__sparc) || defined(__sparc__)
 #  define ARCHITECTURE_ID "sparc"
+#elif defined(__sw_64) || defined(__sw_64__)
+#  define ARCHITECTURE_ID "sw_64"
 #elif defined(__hppa) || defined(__hppa__)
 #  if defined(__LP64__)
 #    define ARCHITECTURE_ID "parisc64"
diff --git a/Modules/CMakeFortranCompilerABI.F b/Modules/CMakeFortranCompilerABI.F
index ed827305e2..767e993cdc 100644
--- a/Modules/CMakeFortranCompilerABI.F
+++ b/Modules/CMakeFortranCompilerABI.F
@@ -113,8 +113,6 @@
         PRINT *, 'INFO:arch[riscv64]'
 #elif defined(__riscv) && __riscv_xlen == 32
         PRINT *, 'INFO:arch[riscv32]'
-#elif defined(__sw_64) || defined(__sw_64__)
-        PRINT *, 'INFO:arch[sw_64]'
 #elif defined(__s390x__)
         PRINT *, 'INFO:arch[s390x]'
 #elif defined(__s390__)
@@ -123,6 +121,8 @@
         PRINT *, 'INFO:arch[sparcv9]'
 #elif defined(__sparc) || defined(__sparc__)
         PRINT *, 'INFO:arch[sparc]'
+#elif defined(__sw_64) || defined(__sw_64__)
+        PRINT *, 'INFO:arch[sw_64]'
 #elif defined(__hppa) || defined(__hppa__)
 #  if defined(__LP64__)
         PRINT *, 'INFO:arch[parisc64]'
diff --git a/Modules/CMakeFortranCompilerABI.F90 b/Modules/CMakeFortranCompilerABI.F90
index 1dfd560961..fcf046f642 100644
--- a/Modules/CMakeFortranCompilerABI.F90
+++ b/Modules/CMakeFortranCompilerABI.F90
@@ -105,8 +105,6 @@ PRINT *, 'INFO:arch[loongarch64]'
 PRINT *, 'INFO:arch[loongarch32]'
 #elif defined(__m68k__)
 PRINT *, 'INFO:arch[m68k]'
-#elif defined(__sw_64)
-PRINT *, 'INFO:arch[sw_64]'
 #elif defined(__mips64) || defined(__mips64__)
 #  if defined(_MIPSEL)
 PRINT *, 'INFO:arch[mips64el]'
@@ -131,6 +129,8 @@ PRINT *, 'INFO:arch[s390]'
 PRINT *, 'INFO:arch[sparcv9]'
 #elif defined(__sparc) || defined(__sparc__)
 PRINT *, 'INFO:arch[sparc]'
+#elif defined(__sw_64) || defined(__sw_64__)
+PRINT *, 'INFO:arch[sw_64]'
 #elif defined(__hppa) || defined(__hppa__)
 #  if defined(__LP64__)
 PRINT *, 'INFO:arch[parisc64]'