diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-18 08:43:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-18 13:49:30 +0200 |
| commit | 4341f6763b8a737ebc07bb78ead22bc05a1a515b (patch) | |
| tree | 01b5b41993c6142074bfd66f752306b1db8123fd /src/3rdparty/libjpeg/src/jcphuff.c | |
| parent | 0c8eb58ba07e248701ff28891c79dfe2fa32dc23 (diff) | |
Cherry-pick upstream patch for non-gcc/clang/msvc compilersv5.12.11
Fix build w/ non-GCC-compatible Un*x/Arm compilers
Fixes: QTBUG-93779
Pick-to: dev 6.1 6.0 5.15 5.12
Change-Id: Ib52e9ded6e2814c7998d6cd798e945da0f87f7a1
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/3rdparty/libjpeg/src/jcphuff.c')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jcphuff.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/3rdparty/libjpeg/src/jcphuff.c b/src/3rdparty/libjpeg/src/jcphuff.c index bd14fc27d5..9bf96124b4 100644 --- a/src/3rdparty/libjpeg/src/jcphuff.c +++ b/src/3rdparty/libjpeg/src/jcphuff.c @@ -52,8 +52,9 @@ * flags (this defines __thumb__). */ -#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || \ - defined(_M_ARM64) +/* NOTE: Both GCC and Clang define __GNUC__ */ +#if (defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))) || \ + defined(_M_ARM) || defined(_M_ARM64) #if !defined(__thumb__) || defined(__thumb2__) #define USE_CLZ_INTRINSIC #endif |