From 265899bdcc8f19d15cc13628feb596201b4976d4 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 25 Jul 2016 20:03:18 -0700 Subject: [PATCH] compressor: Better arch ifdefs for isal code Signed-off-by: Dan Mick --- src/compressor/zlib/ZlibCompressor.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/compressor/zlib/ZlibCompressor.cc b/src/compressor/zlib/ZlibCompressor.cc index 342677d4df0d..0852cd89862c 100644 --- a/src/compressor/zlib/ZlibCompressor.cc +++ b/src/compressor/zlib/ZlibCompressor.cc @@ -99,12 +99,9 @@ int ZlibCompressor::zlib_compress(const bufferlist &in, bufferlist &out) return 0; } +#if __x86_64__ int ZlibCompressor::isal_compress(const bufferlist &in, bufferlist &out) { -#if (__arm__) - derr << "Unsupported architecture" << dendl; - return -1; -#else int ret; unsigned have; isal_zstream strm; @@ -152,15 +149,19 @@ int ZlibCompressor::isal_compress(const bufferlist &in, bufferlist &out) } return 0; -#endif } +#endif int ZlibCompressor::compress(const bufferlist &in, bufferlist &out) { +#if __x86_64__ if (isal_enabled) return isal_compress(in, out); else return zlib_compress(in, out); +#else + return zlib_compress(in, out); +#endif } int ZlibCompressor::decompress(bufferlist::iterator &p, size_t compressed_size, bufferlist &out) -- 2.47.3