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.
This commit is contained in:
Brad King
2026-06-24 11:32:44 -04:00
parent a733b2c1ce
commit e88a4b9f2c
3 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -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"
+2 -2
View File
@@ -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]'
+2 -2
View File
@@ -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]'