Commit 93504262 authored by Alexander Gerasiov's avatar Alexander Gerasiov

Add 0015-Fix-fallback-lz4-decomression.patch - Should fix FTBFS on non-amd64 and non-arm64 archs.

Signed-off-by: Alexander Gerasiov's avatarAlexander GQ Gerasiov <gq@cs.msu.su>
parent 18b9fa6b
From: Alexander GQ Gerasiov <gq@cs.msu.su>
Date: Thu, 31 Jan 2019 22:27:27 +0300
Subject: Fix fallback lz4 decomression.
---
dbms/src/IO/LZ4_decompress_faster.cpp | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/dbms/src/IO/LZ4_decompress_faster.cpp b/dbms/src/IO/LZ4_decompress_faster.cpp
index 243bdd9..42885b2 100644
--- a/dbms/src/IO/LZ4_decompress_faster.cpp
+++ b/dbms/src/IO/LZ4_decompress_faster.cpp
@@ -71,7 +71,7 @@ inline void copyOverlap8(UInt8 * op, const UInt8 *& match, const size_t offset)
}
-#ifdef __x86_64__
+#ifndef __aarch64__
/** We use 'xmm' (128bit SSE) registers here to shuffle 16 bytes.
*
@@ -179,10 +179,7 @@ inline void copyOverlap8Shuffle(UInt8 * op, const UInt8 *& match, const size_t o
#endif
}
-#endif
-
-
-#ifdef __aarch64__
+#else
inline void copyOverlap8Shuffle(UInt8 * op, const UInt8 *& match, const size_t offset)
{
@@ -261,7 +258,7 @@ inline void copyOverlap16(UInt8 * op, const UInt8 *& match, const size_t offset)
}
-#ifdef __x86_64__
+#ifndef __aarch64__
inline void copyOverlap16Shuffle(UInt8 * op, const UInt8 *& match, const size_t offset)
{
@@ -299,9 +296,7 @@ inline void copyOverlap16Shuffle(UInt8 * op, const UInt8 *& match, const size_t
#endif
}
-#endif
-
-#ifdef __aarch64__
+#else
inline void copyOverlap16Shuffle(UInt8 * op, const UInt8 *& match, const size_t offset)
{
......@@ -12,3 +12,4 @@
0012-Correctly-find-and-use-system-metrohash-library.patch
0013-server-config.xml-Set-log-level-to-warning.patch
0014-Set-default-umask-to-027.patch
0015-Fix-fallback-lz4-decomression.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment