Skip to content

Commit 017d374

Browse files
committed
Fix check for arm32 so umul is used consistently on gcc and clang when building on arm64.
1 parent a95befa commit 017d374

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

parallel_hashmap/phmap_config.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,15 @@
182182
// Checks whether the __int128 compiler extension for a 128-bit
183183
// integral type is supported.
184184
// ------------------------------------------------------------
185+
#if defined(__arm__) && !defined(__aarch64__)
186+
#define PHMAP_ARM_32
187+
#endif
188+
185189
#ifdef PHMAP_HAVE_INTRINSIC_INT128
186190
#error PHMAP_HAVE_INTRINSIC_INT128 cannot be directly set
187191
#elif defined(__SIZEOF_INT128__)
188-
#if (defined(__clang__) && !defined(_WIN32) && !defined(__aarch64__)) || \
189-
(defined(__CUDACC__) && __CUDACC_VER_MAJOR__ >= 9) || \
192+
#if (defined(__clang__) && !defined(_WIN32) && !(defined(PHMAP_ARM_32))) || \
193+
(defined(__CUDACC__) && __CUDACC_VER_MAJOR__ >= 9) || \
190194
(defined(__GNUC__) && !defined(__clang__) && !defined(__CUDACC__))
191195
#define PHMAP_HAVE_INTRINSIC_INT128 1
192196
#elif defined(__CUDACC__)

0 commit comments

Comments
 (0)