From 06a1bf26cfee9c8fef452ad30d7a57c0f6564356 Mon Sep 17 00:00:00 2001 From: wzx Date: Mon, 24 Oct 2022 16:58:02 +0800 Subject: [PATCH 1/2] Add sw64 architecture Signed-off-by: wzx --- numpy-1.21.4-sw.patch | 23 +++++++++++++++++++++++ numpy.spec | 6 +++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100755 numpy-1.21.4-sw.patch diff --git a/numpy-1.21.4-sw.patch b/numpy-1.21.4-sw.patch new file mode 100755 index 0000000..af48839 --- /dev/null +++ b/numpy-1.21.4-sw.patch @@ -0,0 +1,23 @@ +diff -Naur numpy-1.21.4.org/numpy/core/include/numpy/npy_cpu.h numpy-1.21.4.sw/numpy/core/include/numpy/npy_cpu.h +--- numpy-1.21.4.org/numpy/core/include/numpy/npy_cpu.h 2022-02-27 02:48:27.080000000 +0000 ++++ numpy-1.21.4.sw/numpy/core/include/numpy/npy_cpu.h 2022-02-28 06:42:23.070000000 +0000 +@@ -61,6 +61,8 @@ + #define NPY_CPU_IA64 + #elif defined(__hppa) + #define NPY_CPU_HPPA ++#elif defined(__sw_64__) ++ #define NPY_CPU_SW_64 + #elif defined(__alpha__) + #define NPY_CPU_ALPHA + #elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM64) +diff -Naur numpy-1.21.4.org/numpy/core/include/numpy/npy_endian.h numpy-1.21.4.sw/numpy/core/include/numpy/npy_endian.h +--- numpy-1.21.4.org/numpy/core/include/numpy/npy_endian.h 2022-02-27 02:48:27.080000000 +0000 ++++ numpy-1.21.4.sw/numpy/core/include/numpy/npy_endian.h 2022-02-28 06:44:18.830000000 +0000 +@@ -41,6 +41,7 @@ + || defined(NPY_CPU_AMD64) \ + || defined(NPY_CPU_IA64) \ + || defined(NPY_CPU_ALPHA) \ ++ || defined(NPY_CPU_SW_64) \ + || defined(NPY_CPU_ARMEL) \ + || defined(NPY_CPU_ARMEL_AARCH32) \ + || defined(NPY_CPU_ARMEL_AARCH64) \ diff --git a/numpy.spec b/numpy.spec index 373aef5..7a011ee 100644 --- a/numpy.spec +++ b/numpy.spec @@ -2,7 +2,7 @@ Name: numpy Version: 1.21.4 -Release: 4 +Release: 5 Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -17,6 +17,7 @@ BuildRequires: python3-Cython >= 0.29.24 Patch0: backport-CVE-2021-41496.patch Patch1: backport-CVE-2021-41495.patch Patch2: backport-CVE-2021-34141.patch +Patch3: numpy-1.21.4-sw.patch %description NumPy is the fundamental package for scientific computing with Python. It contains among other things: @@ -106,6 +107,9 @@ popd &> /dev/null %changelog +* Mon Oct 24 2022 wuzx - 1.21.4-5 +- Add sw64 architecture + * Thu May 26 2022 renhongxun - 1.21.4-4 - fix CVE-2021-34141 -- Gitee From feef4e2a405a2f7b77352aa2916a63012d1b3075 Mon Sep 17 00:00:00 2001 From: zhaozhen Date: Mon, 14 Nov 2022 16:03:42 +0800 Subject: [PATCH 2/2] add loongarch support --- 0001-add-loongarch-architecture-support.patch | 46 +++++++++++++++++++ numpy.spec | 9 +++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 0001-add-loongarch-architecture-support.patch diff --git a/0001-add-loongarch-architecture-support.patch b/0001-add-loongarch-architecture-support.patch new file mode 100644 index 0000000..7b55bc1 --- /dev/null +++ b/0001-add-loongarch-architecture-support.patch @@ -0,0 +1,46 @@ +From ca19adc35b02cff09844228f2562b1d1522e2fe4 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Mon, 25 Apr 2022 09:49:00 +0800 +Subject: [PATCH] add loongarch architecture support + +--- + numpy/core/include/numpy/npy_cpu.h | 3 +++ + numpy/core/include/numpy/npy_endian.h | 1 + + 2 files changed, 4 insertions(+) + +diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h +index bc1fad7..e975b01 100644 +--- a/numpy/core/include/numpy/npy_cpu.h ++++ b/numpy/core/include/numpy/npy_cpu.h +@@ -18,6 +18,7 @@ + * NPY_CPU_ARCEL + * NPY_CPU_ARCEB + * NPY_CPU_RISCV64 ++ * NPY_CPU_LOONGARCH + * NPY_CPU_WASM + */ + #ifndef _NPY_CPUARCH_H_ +@@ -103,6 +104,8 @@ + #define NPY_CPU_ARCEB + #elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 + #define NPY_CPU_RISCV64 ++#elif defined(__loongarch__) ++ #define NPY_CPU_LOONGARCH + #elif defined(__EMSCRIPTEN__) + /* __EMSCRIPTEN__ is defined by emscripten: an LLVM-to-Web compiler */ + #define NPY_CPU_WASM +diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h +index aa367a0..82609ed 100644 +--- a/numpy/core/include/numpy/npy_endian.h ++++ b/numpy/core/include/numpy/npy_endian.h +@@ -49,6 +49,7 @@ + || defined(NPY_CPU_PPC64LE) \ + || defined(NPY_CPU_ARCEL) \ + || defined(NPY_CPU_RISCV64) \ ++ || defined(NPY_CPU_LOONGARCH) \ + || defined(NPY_CPU_WASM) + #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN + #elif defined(NPY_CPU_PPC) \ +-- +2.27.0 + diff --git a/numpy.spec b/numpy.spec index 7a011ee..bff0b4c 100644 --- a/numpy.spec +++ b/numpy.spec @@ -2,7 +2,7 @@ Name: numpy Version: 1.21.4 -Release: 5 +Release: 6 Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -18,6 +18,7 @@ Patch0: backport-CVE-2021-41496.patch Patch1: backport-CVE-2021-41495.patch Patch2: backport-CVE-2021-34141.patch Patch3: numpy-1.21.4-sw.patch +Patch4: 0001-add-loongarch-architecture-support.patch %description NumPy is the fundamental package for scientific computing with Python. It contains among other things: @@ -107,6 +108,12 @@ popd &> /dev/null %changelog +* Mon Nov 14 2022 zhaozhen - 1.21.4-6 +- Type:feature +- CVE:NA +- SUG:NA +- DESC:Add loongarch64 support + * Mon Oct 24 2022 wuzx - 1.21.4-5 - Add sw64 architecture -- Gitee