fix multiple/undefined symbols when using fat runtimes

diff --git a/src/util/supervector/arch/x86/impl.cpp b/src/util/supervector/arch/x86/impl.cpp
index eaee7424f4e939dcc819fcd2ae86cf4afdb16c2d..164c4e8b280d99821897a8274bf6d602294f53ff 100644 (file)
--- a/src/util/supervector/arch/x86/impl.cpp
+++ b/src/util/supervector/arch/x86/impl.cpp
@@ -38,8 +38,8 @@
 #include "util/unaligned.h"
 #include "util/supervector/supervector.hpp"
 
-#if (defined(FAT_RUNTIME) && !defined(HAVE_AVX2) && !defined(HAVE_AVX512)) || (!defined(FAT_RUNTIME) && defined(HAVE_SIMD_128_BITS))
 // 128-bit SSE implementation
+#if !(!defined(RELEASE_BUILD) && defined(FAT_RUNTIME) && (defined(HAVE_AVX2) || defined(HAVE_AVX512))) && defined(HAVE_SIMD_128_BITS)
 
 template<>
 really_inline SuperVector<16>::SuperVector(SuperVector const &other)
@@ -570,7 +570,8 @@ really_inline SuperVector<16> SuperVector<16>::pshufb_maskz(SuperVector<16> b, u
 #endif // !defined(FAT_RUNTIME) && !defined(HAVE_AVX2)
 
 // 256-bit AVX2 implementation
-#if (defined(FAT_RUNTIME) && defined(HAVE_AVX2) && !defined(HAVE_AVX512)) || (!defined(FAT_RUNTIME) && defined(HAVE_AVX2))
+#if !(!defined(RELEASE_BUILD) && defined(FAT_RUNTIME) && defined(HAVE_AVX512)) && defined(HAVE_AVX2)
+
 template<>
 really_inline SuperVector<32>::SuperVector(SuperVector const &other)
 {
@@ -1200,6 +1201,7 @@ really_inline SuperVector<32> SuperVector<32>::pshufb_maskz(SuperVector<32> b, u
 
 // 512-bit AVX512 implementation
 #if defined(HAVE_AVX512)
+
 template<>
 really_inline SuperVector<64>::SuperVector(SuperVector const &o)
 {