summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Rohr <prohr@google.com>2023-04-04 15:10:53 -0700
committerPatrick Rohr <prohr@google.com>2023-04-04 15:45:08 -0700
commit9a31821f022782cbb861d3b9e7a417440a8567f7 (patch)
treed25a09549731f8144a2d855deab837b51b23e254
parent48a689a44b7db37bc031a6ae4a6a83594eb7bab8 (diff)
downloadcronet-9a31821f022782cbb861d3b9e7a417440a8567f7.tar.gz
cronet: fix abseil in version 110
Abseil in Chromium release version 110 is broken in AOSP due to a bug in Abseil. This was fixed in cl/499498979 which is available in Chromium release 111. Test: try to build Change-Id: I3d971840152c8b5fbaae7ea2805f80d9531ffa85
-rw-r--r--third_party/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h b/third_party/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h
index f23cd75eb..344042d8e 100644
--- a/third_party/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h
+++ b/third_party/abseil-cpp/absl/crc/internal/crc32_x86_arm_combined_simd.h
@@ -25,8 +25,10 @@
// We define a translation layer for both x86 and ARM for the ease of use and
// most performance gains.
-// We need CRC (part of SSE 4.2) and PCLMULQDQ instructions.
-#if defined(__SSE4_2__) && defined(__PCLMUL__)
+// This implementation requires 64-bit CRC instructions (part of SSE 4.2) and
+// PCLMULQDQ instructions. 32-bit builds with SSE 4.2 do exist, so the
+// __x86_64__ condition is necessary.
+#if defined(__x86_64__) && defined(__SSE4_2__) && defined(__PCLMUL__)
#include <x86intrin.h>
#define ABSL_CRC_INTERNAL_HAVE_X86_SIMD