diff --git a/fftw-3.3.10.tar.gz b/fftw-3.3.10.tar.gz new file mode 100644 index 0000000..f69fccc Binary files /dev/null and b/fftw-3.3.10.tar.gz differ diff --git a/fftw-3.3.8-sw.patch b/fftw-3.3.8-sw.patch deleted file mode 100755 index 6d92d13..0000000 --- a/fftw-3.3.8-sw.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur fftw-3.3.8.org/kernel/cycle.h fftw-3.3.8.sw/kernel/cycle.h ---- fftw-3.3.8.org/kernel/cycle.h 2022-03-03 08:12:02.740000000 +0000 -+++ fftw-3.3.8.sw/kernel/cycle.h 2022-03-03 08:14:34.660000000 +0000 -@@ -385,6 +385,26 @@ - #define HAVE_TICK_COUNTER - #endif - /*----------------------------------------------------------------*/ -+#if defined(__GNUC__) && defined(__sw_64__) && !defined(HAVE_TICK_COUNTER) -+/* -+ * The 32-bit cycle counter on sw_64 overflows pretty quickly, -+ * unfortunately. A 1GHz machine overflows in 4 seconds. -+ */ -+typedef unsigned int ticks; -+ -+static __inline__ ticks getticks(void) -+{ -+ unsigned long cc; -+ __asm__ __volatile__ ("rtc %0" : "=r"(cc)); -+ return (cc & 0xFFFFFFFF); -+} -+ -+INLINE_ELAPSED(__inline__) -+ -+#define HAVE_TICK_COUNTER -+#endif -+ -+/*----------------------------------------------------------------*/ - #if defined(__GNUC__) && defined(__alpha__) && !defined(HAVE_TICK_COUNTER) - /* - * The 32-bit cycle counter on alpha overflows pretty quickly, -@@ -421,6 +441,22 @@ - #endif - - /*----------------------------------------------------------------*/ -+#if (defined(__DECC) || defined(__DECCXX)) && defined(__sw_64) && defined(HAVE_C_ASM_H) && !defined(HAVE_TICK_COUNTER) -+# include -+typedef unsigned int ticks; -+ -+static __inline ticks getticks(void) -+{ -+ unsigned long cc; -+ cc = asm("rtc %v0"); -+ return (cc & 0xFFFFFFFF); -+} -+ -+INLINE_ELAPSED(__inline) -+ -+#define HAVE_TICK_COUNTER -+#endif -+/*----------------------------------------------------------------*/ - #if (defined(__DECC) || defined(__DECCXX)) && defined(__alpha) && defined(HAVE_C_ASM_H) && !defined(HAVE_TICK_COUNTER) - # include - typedef unsigned int ticks; diff --git a/fftw-3.3.8.tar.gz b/fftw-3.3.8.tar.gz deleted file mode 100644 index 21eb2b3..0000000 Binary files a/fftw-3.3.8.tar.gz and /dev/null differ diff --git a/fftw.spec b/fftw.spec index 2a91cb7..b9c9372 100644 --- a/fftw.spec +++ b/fftw.spec @@ -10,15 +10,12 @@ %endif Name: fftw -Version: 3.3.8 -Release: 10 +Version: 3.3.10 +Release: 1 Summary: A C subroutine library for computing the discrete Fourier transform License: GPLv2+ URL: http://www.fftw.org Source0: http://www.fftw.org/fftw-%{version}.tar.gz -%ifarch sw_64 -Patch1: fftw-3.3.8-sw.patch -%endif BuildRequires: gcc-gfortran autoconf automake libtool time perl-interpreter gcc_secure make %global quad 0 @@ -465,8 +462,8 @@ fi %endif %changelog -* Wed Oct 19 2022 wuzx - 3.3.8-10 -- add sw64 patch +* Thu Sep 15 2022 lutkunpeng - 3.3.10-1 +- DESC: update to 3.3.10 * Sat Jul 30 2022 yaoxin - 3.3.8-9 - Strip the symbol table