From 0ff5cba9f5a57b7fb6e9542877c840a6831bd307 Mon Sep 17 00:00:00 2001 From: YOKOTA Hiroshi Date: Wed, 13 Oct 2021 07:59:13 +0900 Subject: [PATCH] Guard ARM v8 feature from old architecture Forwarded: https://sourceforge.net/p/sevenzip/patches/369/ Gbp-Pq: Name 0004-Guard-ARM-v8-feature-from-old-architecture.patch --- 3rdparty/lzma/C/7zCrc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/3rdparty/lzma/C/7zCrc.c b/3rdparty/lzma/C/7zCrc.c index f186324dd..51d91ee74 100644 --- a/3rdparty/lzma/C/7zCrc.c +++ b/3rdparty/lzma/C/7zCrc.c @@ -81,8 +81,9 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *data, size_t size, const U #define USE_ARM64_CRC #endif #endif - #elif (defined(__clang__) && (__clang_major__ >= 3)) \ - || (defined(__GNUC__) && (__GNUC__ > 4)) + #elif ( (defined(__clang__) && (__clang_major__ >= 3)) || \ + (defined(__GNUC__) && (__GNUC__ > 4) ) ) && \ + (__ARM_ARCH >= 8) #if !defined(__ARM_FEATURE_CRC32) #define __ARM_FEATURE_CRC32 1 #if (!defined(__clang__) || (__clang_major__ > 3)) // fix these numbers -- 2.30.2