From d235b1c45062dcaa42ceb457baec4b752c8a2df1 Mon Sep 17 00:00:00 2001 From: Hailiang Date: Thu, 6 Mar 2025 17:50:10 +0800 Subject: [PATCH] add support for sw_64 (cherry picked from commit b3aa1827d1d3a861dc6ddbc188e2818ce977b04f) --- ...0001-add-support-for-loongarch-sw_64.patch | 24 +++++++++---------- cln.spec | 7 ++++-- 2 files changed, 17 insertions(+), 14 deletions(-) rename 0001-add-support-for-loongarch.patch => 0001-add-support-for-loongarch-sw_64.patch (90%) diff --git a/0001-add-support-for-loongarch.patch b/0001-add-support-for-loongarch-sw_64.patch similarity index 90% rename from 0001-add-support-for-loongarch.patch rename to 0001-add-support-for-loongarch-sw_64.patch index fa4b805..bfc7f92 100644 --- a/0001-add-support-for-loongarch.patch +++ b/0001-add-support-for-loongarch-sw_64.patch @@ -1,7 +1,7 @@ -From 538c493d480cf09f5d764553f065581ff1e066b1 Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Wed, 19 Jun 2024 14:57:24 +0800 -Subject: [PATCH] add support for loongarch +From 5f615f67202f46a3ee6a234bc094c5a1cbebb615 Mon Sep 17 00:00:00 2001 +From: Hailiang +Date: Thu, 6 Mar 2025 17:47:05 +0800 +Subject: [PATCH] add support for loongarch sw_64 --- include/cln/object.h | 2 +- @@ -9,7 +9,7 @@ Subject: [PATCH] add support for loongarch 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/cln/object.h b/include/cln/object.h -index f6da29f..87ce1e3 100644 +index f6da29f..bf7a2b9 100644 --- a/include/cln/object.h +++ b/include/cln/object.h @@ -25,7 +25,7 @@ namespace cln { @@ -17,12 +17,12 @@ index f6da29f..87ce1e3 100644 #define cl_word_alignment 4 #endif -#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__s390x__) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__) -+#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__s390x__) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__) || defined(__loongarch_lp64) ++#if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__s390x__) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__) || defined(__loongarch_lp64) || defined(__sw_64__) #define cl_word_alignment 8 #endif #if !defined(cl_word_alignment) diff --git a/include/cln/types.h b/include/cln/types.h -index 7ec3770..519954a 100644 +index 7ec3770..881e93b 100644 --- a/include/cln/types.h +++ b/include/cln/types.h @@ -51,7 +51,7 @@ @@ -30,7 +30,7 @@ index 7ec3770..519954a 100644 #endif #endif - #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) || defined(_M_AMD64)) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64)) || defined(__e2k__) -+ #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) || defined(_M_AMD64)) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64)) || defined(__e2k__) || defined(__loongarch_lp64) ++ #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) || defined(_M_AMD64)) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64)) || defined(__e2k__) || defined(__loongarch_lp64) || defined(__sw_64__) // 64 bit registers in hardware #define HAVE_FAST_LONGLONG #endif @@ -39,7 +39,7 @@ index 7ec3770..519954a 100644 // Integer type used for counters. // Constraint: sizeof(uintC) >= sizeof(uintL) - #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__aarch64__) || defined(__mips64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__))) -+ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__aarch64__) || defined(__mips64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__) || defined(__loongarch_lp64))) ++ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__aarch64__) || defined(__mips64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__) || defined(__loongarch_lp64) || defined(__sw_64__))) #define intCsize long_bitsize typedef long sintC; typedef unsigned long uintC; @@ -48,7 +48,7 @@ index 7ec3770..519954a 100644 // Integer type used for lfloat exponents. // Constraint: sizeof(uintE) >= sizeof(uintC) - #if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__))) -+ #if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__) || defined(__loongarch_lp64))) ++ #if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__) || defined(__aarch64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__) || defined(__loongarch_lp64) || defined(__sw_64__))) #define intEsize 64 typedef sint64 sintE; typedef uint64 uintE; @@ -57,10 +57,10 @@ index 7ec3770..519954a 100644 typedef unsigned int uintD; #else // we are not using GMP, so just guess something reasonable - #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__s390x__) || defined(__x86_64__) || defined(__aarch64__) || defined(__mips64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__))) -+ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__s390x__) || defined(__x86_64__) || defined(__aarch64__) || defined(__mips64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__) || defined(__loongarch_lp64))) ++ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__s390x__) || defined(__x86_64__) || defined(__aarch64__) || defined(__mips64__) || (defined(__riscv) && __riscv_xlen == 64) || defined(__e2k__) || defined(__loongarch_lp64) || defined(__sw_64__))) #define intDsize 64 typedef sint64 sintD; typedef uint64 uintD; -- -2.43.0 +2.20.1 diff --git a/cln.spec b/cln.spec index fee42bd..c15350a 100644 --- a/cln.spec +++ b/cln.spec @@ -1,11 +1,11 @@ Name: cln Version: 1.3.6 -Release: 4 +Release: 5 Summary: Class Library for Numbers License: GPL-2.0-or-later URL: https://www.ginac.de/CLN/ Source0: https://www.ginac.de/CLN/%{name}-%{version}.tar.bz2 -Patch001: 0001-add-support-for-loongarch.patch +Patch001: 0001-add-support-for-loongarch-sw_64.patch BuildRequires: gcc-c++ BuildRequires: gmp-devel @@ -71,6 +71,9 @@ make %{_smp_mflags} check %doc doc/cln.pdf doc/cln.html %changelog +* Thu Mar 06 2025 mahailiang - 1.3.6-5 +- add support for sw_64 + * Wed Jun 19 2024 Wenlong Zhang - 1.3.6-4 - add support for loongarch