diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-26 14:21:17 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-26 14:23:10 +0000 |
| commit | e462ed0aa2eb4c2049f6b20a56b54f6bd7c90644 (patch) | |
| tree | b1631eed7323877474fb91230133b967acdf1377 /main/fftw/cycle.h.patch | |
| parent | 487b0fdfef321fa9b68f399bd8cc561d1721ed9a (diff) | |
| download | aports-e462ed0aa2eb4c2049f6b20a56b54f6bd7c90644.tar.bz2 aports-e462ed0aa2eb4c2049f6b20a56b54f6bd7c90644.tar.xz | |
main/fftw: re-enable build for s390x
we disable HAVE_TICK_COUNTER
Diffstat (limited to 'main/fftw/cycle.h.patch')
| -rw-r--r-- | main/fftw/cycle.h.patch | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/main/fftw/cycle.h.patch b/main/fftw/cycle.h.patch index ff70cdb4d9..2b2adde334 100644 --- a/main/fftw/cycle.h.patch +++ b/main/fftw/cycle.h.patch @@ -1,9 +1,35 @@ ---- ./kernel/cycle.h.orig -+++ ./kernel/cycle.h -@@ -437,26 +437,6 @@ +diff --git a/kernel/cycle.h b/kernel/cycle.h +index a0e86f3..3ff4c0e 100644 +--- a/kernel/cycle.h ++++ b/kernel/cycle.h +@@ -368,22 +368,6 @@ INLINE_ELAPSED(inline) #define HAVE_TICK_COUNTER #endif + +-/*----------------------------------------------------------------*/ +-/* S390, courtesy of James Treacy */ +-#if defined(__GNUC__) && defined(__s390__) && !defined(HAVE_TICK_COUNTER) +-typedef unsigned long long ticks; +- +-static __inline__ ticks getticks(void) +-{ +- ticks cycles; +- __asm__("stck 0(%0)" : : "a" (&(cycles)) : "memory", "cc"); +- return cycles; +-} +- +-INLINE_ELAPSED(__inline__) +- +-#define HAVE_TICK_COUNTER +-#endif /*----------------------------------------------------------------*/ + #if defined(__GNUC__) && defined(__alpha__) && !defined(HAVE_TICK_COUNTER) + /* +@@ -436,26 +420,6 @@ INLINE_ELAPSED(__inline) + + #define HAVE_TICK_COUNTER + #endif +-/*----------------------------------------------------------------*/ -/* SGI/Irix */ -#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_SGI_CYCLE) && !defined(HAVE_TICK_COUNTER) -typedef struct timespec ticks; @@ -23,7 +49,6 @@ -#define HAVE_TICK_COUNTER -#endif - --/*----------------------------------------------------------------*/ + /*----------------------------------------------------------------*/ /* Cray UNICOS _rtc() intrinsic function */ #if defined(HAVE__RTC) && !defined(HAVE_TICK_COUNTER) - #ifdef HAVE_INTRINSICS_H |