Merge pull request numpy#28092 from xen0n/loongarch-lp64

rgommers · web-flow · commit af9f6074bfdb · 2025-01-24T07:35:17.000+01:00
MAINT: LoongArch: switch away from the __loongarch64 preprocessor macro
diff --git a/numpy/_core/include/numpy/npy_cpu.h b/numpy/_core/include/numpy/npy_cpu.h
@@ -109,7 +109,7 @@
     #elif __riscv_xlen == 32
 	#define NPY_CPU_RISCV32
     #endif
-#elif defined(__loongarch64)
+#elif defined(__loongarch_lp64)
     #define NPY_CPU_LOONGARCH64
 #elif defined(__EMSCRIPTEN__)
     /* __EMSCRIPTEN__ is defined by emscripten: an LLVM-to-Web compiler */
diff --git a/numpy/_core/src/common/npy_cpu_features.c b/numpy/_core/src/common/npy_cpu_features.c
@@ -668,7 +668,7 @@ npy__cpu_init_features(void)
 
 /***************** LoongArch ******************/
 
-#elif defined(__loongarch64)
+#elif defined(__loongarch_lp64)
 
 #include <sys/auxv.h>
 #include <asm/hwcap.h>
@@ -685,7 +685,6 @@ npy__cpu_init_features(void)
    }
 }
 
-
 /***************** ARM ******************/
 
 #elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM64)

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ npy__cpu_init_features(void)`
`668`	`668`
`669`	`669`	`/*************** LoongArch ****************/`
`670`	`670`
`671`		`-#elif defined(__loongarch64)`
	`671`	`+#elif defined(__loongarch_lp64)`
`672`	`672`
`673`	`673`	`#include <sys/auxv.h>`
`674`	`674`	`#include <asm/hwcap.h>`
`@@ -685,7 +685,6 @@ npy__cpu_init_features(void)`
`685`	`685`	`}`
`686`	`686`	`}`
`687`	`687`
`688`		`-`
`689`	`688`	`/*************** ARM ****************/`
`690`	`689`
`691`	`690`	`#elif defined(__arm__) \|\| defined(__aarch64__) \|\| defined(_M_ARM64)`