diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-22 14:06:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-06-01 09:13:53 +0000 |
| commit | 8388ef5c9c11386fdccd4bdb6435028345cb188e (patch) | |
| tree | e22ed62b50bdbd9b0d2e0b673f65309e6df02bd7 | |
| parent | d8b43c152f2f33a4e389abaa30be7958d4d6f234 (diff) | |
| download | qtwebengine-chromium-8388ef5c9c11386fdccd4bdb6435028345cb188e.tar.gz | |
Fix clang version detection on Apple clang
Apple are using an their own arbitrary versioning.
Change-Id: I9358b09dc4eefccacc788762224937f8ac475188
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/third_party/libyuv/include/libyuv/compare_row.h | 3 | ||||
| -rw-r--r-- | chromium/third_party/libyuv/include/libyuv/row.h | 9 | ||||
| -rw-r--r-- | chromium/third_party/libyuv/include/libyuv/scale_row.h | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/chromium/third_party/libyuv/include/libyuv/compare_row.h b/chromium/third_party/libyuv/include/libyuv/compare_row.h index d38f9987dc6..1cb38a45010 100644 --- a/chromium/third_party/libyuv/include/libyuv/compare_row.h +++ b/chromium/third_party/libyuv/include/libyuv/compare_row.h @@ -40,7 +40,8 @@ extern "C" { // clang >= 3.4.0 required for AVX2. #if defined(__clang__) && (defined(__x86_64__) || defined(__i386__)) -#if (__clang_major__ > 3) || (__clang_major__ == 3 && (__clang_minor__ >= 4)) +#if ((__clang_major__ > 3) || (__clang_major__ == 3 && (__clang_minor__ >= 4))) && \ + (!defined(__apple_build_version__) || __apple_build_version__ >= 5030038) #define CLANG_HAS_AVX2 1 #endif // clang >= 3.4 #endif // __clang__ diff --git a/chromium/third_party/libyuv/include/libyuv/row.h b/chromium/third_party/libyuv/include/libyuv/row.h index 646a6abb10c..6f5a25a28cd 100644 --- a/chromium/third_party/libyuv/include/libyuv/row.h +++ b/chromium/third_party/libyuv/include/libyuv/row.h @@ -36,7 +36,8 @@ extern "C" { #endif // clang >= 3.5.0 required for Arm64. #if defined(__clang__) && defined(__aarch64__) && !defined(LIBYUV_DISABLE_NEON) -#if (__clang_major__ < 3) || (__clang_major__ == 3 && (__clang_minor__ < 5)) +#if ((__clang_major__ < 3) || (__clang_major__ == 3 && (__clang_minor__ < 5))) && \ + (!defined(__apple_build_version__) || __apple_build_version__ >= 6000051) #define LIBYUV_DISABLE_NEON #endif // clang >= 3.5 #endif // __clang__ @@ -50,15 +51,15 @@ extern "C" { // clang >= 3.4.0 required for AVX2. #if defined(__clang__) && (defined(__x86_64__) || defined(__i386__)) -#if (__clang_major__ > 3) || (__clang_major__ == 3 && (__clang_minor__ >= 4)) +#if ((__clang_major__ > 3) || (__clang_major__ == 3 && (__clang_minor__ >= 4))) && \ + (!defined(__apple_build_version__) || __apple_build_version__ >= 5030038) #define CLANG_HAS_AVX2 1 #endif // clang >= 3.4 #endif // __clang__ // clang >= 6.0.0 required for AVX512. -// TODO(fbarchard): fix xcode 9 ios b/789. #if defined(__clang__) && (defined(__x86_64__) || defined(__i386__)) -#if (__clang_major__ >= 7) && !defined(__APPLE_EMBEDDED_SIMULATOR__) +#if (__clang_major__ >= 7) && !defined(__apple_build_version__) #define CLANG_HAS_AVX512 1 #endif // clang >= 7 #endif // __clang__ diff --git a/chromium/third_party/libyuv/include/libyuv/scale_row.h b/chromium/third_party/libyuv/include/libyuv/scale_row.h index 7194ba09f84..6fa4de5b4cb 100644 --- a/chromium/third_party/libyuv/include/libyuv/scale_row.h +++ b/chromium/third_party/libyuv/include/libyuv/scale_row.h @@ -42,7 +42,8 @@ extern "C" { // clang >= 3.4.0 required for AVX2. #if defined(__clang__) && (defined(__x86_64__) || defined(__i386__)) -#if (__clang_major__ > 3) || (__clang_major__ == 3 && (__clang_minor__ >= 4)) +#if ((__clang_major__ > 3) || (__clang_major__ == 3 && (__clang_minor__ >= 4))) && \ + (!defined(__apple_build_version__) || __apple_build_version__ >= 5030038) #define CLANG_HAS_AVX2 1 #endif // clang >= 3.4 #endif // __clang__ |