packages/fftw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!16 软件包加固第三期 fftw升级

Browse Source 
From: @lutkunpeng 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
This commit is contained in:
openeuler-ci-bot 2022-12-16 08:03:45 +00:00 committed by Gitee
commit 7175ac535a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 4 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fftw-3.3.10.tar.gz Normal file
View File

Binary file not shown.

53
fftw-3.3.8-sw.patch
View File

@ -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 <c_asm.h>
+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 <c_asm.h>
typedef unsigned int ticks;

BIN
fftw-3.3.8.tar.gz
View File

Binary file not shown.

11
fftw.spec
View File

@ -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<wuzx1226@qq.com> - 3.3.8-10
- add sw64 patch
* Thu Sep 15 2022 lutkunpeng <lutkunpeng@163.com> - 3.3.10-1
- DESC: update to 3.3.10
* Sat Jul 30 2022 yaoxin <yaoxin30@h-partners.com> - 3.3.8-9
- Strip the symbol table