<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/14a5dd3519be8bff88588025726bac08fd0621ab">https://github.com/macports/macports-ports/commit/14a5dd3519be8bff88588025726bac08fd0621ab</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 14a5dd3 volk-devel: update to 187993e4 (20170814).
</span>14a5dd3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 14a5dd3519be8bff88588025726bac08fd0621ab
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Aug 15 14:15:03 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> volk-devel: update to 187993e4 (20170814).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove integrated and no longer needed patches.
</span>---
science/volk/Portfile | 20 +-
science/volk/files/patch-add-back-cpuid.diff | 206 ---------------------
.../patch-kernels_volk_volk_32f_x2_pow_32f.h.diff | 29 ---
3 files changed, 4 insertions(+), 251 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/Portfile b/science/volk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a6a639..c106f76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,11 +35,11 @@ provides the release version, which is typically updated every month or so.
</span>
subport volk-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio volk f6dbb5f8ba840075dde9f0aa1cc48b805ea4d1c5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20170605
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio volk 187993e4fb85fd9cce4f47b5d9509cc3955e7844
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170814
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7d65d01d28a456d6c6c0911abab9fb5ee79c00bb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57f1c90987ff3bec816a1884dd69178d6b0b354e3a35beab277f73d9a0927ed8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 060f2293ce71d65b37e9657d78d2bd07e09aece5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7a3dcfe4bd290195559a2b527bb1d70c02222206566f6b367ae783844ce7f642
</span>
conflicts volk
long_description ${long_description} ${subport} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,18 +54,6 @@ homepage http://libvolk.org/
</span> depends_build-append port:pkgconfig
depends_lib-append port:boost
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch to add back using <cpuid.h> if found, and otherwise providing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# a local copy of it, to make older GCC compilers happy. Does not hurt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# when using Clang or GCC >= 4.3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patchfiles-append patch-add-back-cpuid.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to fix building on older compilers that don't handle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dynamic type casting robustly; use correct type API for 'pow' function.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# in 'maint' but we use 'master' here for the devel port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-kernels_volk_volk_32f_x2_pow_32f.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # do VPATH (out of source tree) build
cmake.out_of_source yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-add-back-cpuid.diff b/science/volk/files/patch-add-back-cpuid.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c078b70..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-add-back-cpuid.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,206 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/gcc_x86_cpuid.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,188 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This file is free software; you can redistribute it and/or modify it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * under the terms of the GNU General Public License as published by the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Free Software Foundation; either version 3, or (at your option) any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * later version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This file is distributed in the hope that it will be useful, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * General Public License for more details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Under Section 7 of GPL version 3, you are granted additional
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * permissions described in the GCC Runtime Library Exception, version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * 3.1, as published by the Free Software Foundation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * You should have received a copy of the GNU General Public License and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * a copy of the GCC Runtime Library Exception along with this program;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * <http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* %ecx */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_SSE3 (1 << 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_PCLMUL (1 << 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_SSSE3 (1 << 9)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_FMA (1 << 12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_CMPXCHG16B (1 << 13)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_SSE4_1 (1 << 19)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_SSE4_2 (1 << 20)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_MOVBE (1 << 22)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_POPCNT (1 << 23)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_AES (1 << 25)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_XSAVE (1 << 26)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_OSXSAVE (1 << 27)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_AVX (1 << 28)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_F16C (1 << 29)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_RDRND (1 << 30)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* %edx */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_CMPXCHG8B (1 << 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_CMOV (1 << 15)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_MMX (1 << 23)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_FXSAVE (1 << 24)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_SSE (1 << 25)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_SSE2 (1 << 26)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Extended Features */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* %ecx */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_LAHF_LM (1 << 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_ABM (1 << 5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_SSE4a (1 << 6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_XOP (1 << 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_LWP (1 << 15)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_FMA4 (1 << 16)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_TBM (1 << 21)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* %edx */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_MMXEXT (1 << 22)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_LM (1 << 29)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_3DNOWP (1 << 30)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_3DNOW (1 << 31)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Extended Features (%eax == 7) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_FSGSBASE (1 << 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define bit_BMI (1 << 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__i386__) && defined(__PIC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* %ebx may be the PIC register. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __GNUC__ >= 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __cpuid(level, a, b, c, d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "cpuid\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "xchg{l}\t{%%}ebx, %1\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "0" (level))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __cpuid_count(level, count, a, b, c, d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "cpuid\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "xchg{l}\t{%%}ebx, %1\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "0" (level), "2" (count))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Host GCCs older than 3.0 weren't supporting Intel asm syntax
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nor alternatives in i386 code. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __cpuid(level, a, b, c, d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("xchgl\t%%ebx, %1\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "cpuid\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "xchgl\t%%ebx, %1\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "0" (level))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __cpuid_count(level, count, a, b, c, d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("xchgl\t%%ebx, %1\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "cpuid\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "xchgl\t%%ebx, %1\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "0" (level), "2" (count))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __cpuid(level, a, b, c, d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("cpuid\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "0" (level))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define __cpuid_count(level, count, a, b, c, d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("cpuid\n\t" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "0" (level), "2" (count))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Return highest supported input value for cpuid instruction. ext can
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ be either 0x0 or 0x8000000 to return highest supported value for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ basic or extended cpuid information. Function returns 0 if cpuid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is not supported or whatever cpuid returns in eax register. If sig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pointer is non-null, then first four bytes of the signature
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (as found in ebx register) are returned in location pointed by sig. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static __inline unsigned int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+__get_cpuid_max (unsigned int __ext, unsigned int *__sig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned int __eax, __ebx, __ecx, __edx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __x86_64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* See if we can use cpuid. On AMD64 we always can. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __GNUC__ >= 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("pushf{l|d}\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pushf{l|d}\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pop{l}\t%0\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "mov{l}\t{%0, %1|%1, %0}\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "xor{l}\t{%2, %0|%0, %2}\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "push{l}\t%0\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "popf{l|d}\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pushf{l|d}\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pop{l}\t%0\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "popf{l|d}\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "=&r" (__eax), "=&r" (__ebx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "i" (0x00200000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Host GCCs older than 3.0 weren't supporting Intel asm syntax
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nor alternatives in i386 code. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __asm__ ("pushfl\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pushfl\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "popl\t%0\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "movl\t%0, %1\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "xorl\t%2, %0\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pushl\t%0\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "popfl\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "pushfl\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "popl\t%0\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "popfl\n\t"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "=&r" (__eax), "=&r" (__ebx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : "i" (0x00200000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!((__eax ^ __ebx) & 0x00200000))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Host supports cpuid. Return highest supported cpuid input value. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __cpuid (__ext, __eax, __ebx, __ecx, __edx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (__sig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *__sig = __ebx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return __eax;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Return cpuid data for requested cpuid level, as found in returned
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eax, ebx, ecx and edx registers. The function checks if cpuid is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ supported and returns 1 for valid cpuid information or 0 for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsupported cpuid level. All pointers are required to be non-null. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static __inline int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+__get_cpuid (unsigned int __level,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned int *__eax, unsigned int *__ebx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned int *__ecx, unsigned int *__edx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsigned int __ext = __level & 0x80000000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (__get_cpuid_max (__ext, 0) < __level)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __cpuid (__level, *__eax, *__ebx, *__ecx, *__edx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tmpl/volk_cpu.tmpl.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tmpl/volk_cpu.tmpl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,11 @@ struct VOLK_CPU volk_cpu;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //implement get cpuid for gcc compilers using a system or local copy of cpuid.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #include <cpuid.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if defined(HAVE_CPUID_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <cpuid.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include "gcc_x86_cpuid.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define cpuid_x86(op, r) __get_cpuid(op, (unsigned int *)r+0, (unsigned int *)r+1, (unsigned int *)r+2, (unsigned int *)r+3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Return Intel AVX extended CPU capabilities register.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-kernels_volk_volk_32f_x2_pow_32f.h.diff b/science/volk/files/patch-kernels_volk_volk_32f_x2_pow_32f.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 428a35e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-kernels_volk_volk_32f_x2_pow_32f.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- kernels/volk/volk_32f_x2_pow_32f.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ kernels/volk/volk_32f_x2_pow_32f.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -190,7 +190,7 @@ volk_32f_x2_pow_32f_a_sse4_1(float* cVector, const float* bVector,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- number = quarterPoints * 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(;number < num_points; number++){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *cPtr++ = pow(*aPtr++, *bPtr++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *cPtr++ = powf(*aPtr++, *bPtr++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -215,7 +215,7 @@ volk_32f_x2_pow_32f_generic(float* cVector, const float* bVector,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int number = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(number = 0; number < num_points; number++){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *cPtr++ = pow(*aPtr++, *bPtr++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *cPtr++ = powf(*aPtr++, *bPtr++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* LV_HAVE_GENERIC */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -326,7 +326,7 @@ volk_32f_x2_pow_32f_u_sse4_1(float* cVector, const float* bVector,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- number = quarterPoints * 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(;number < num_points; number++){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *cPtr++ = pow(*aPtr++, *bPtr++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *cPtr++ = powf(*aPtr++, *bPtr++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>