Merge 10e27e2142 into e371736b17

h_malloc.c

@@ -414,7 +414,8 @@ static size_t get_free_slot(struct random_state *rng, size_t slots, const struct
         size_t first_bitmap = random_index / U64_WIDTH;
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wundef"
-#if __x86_64__ && ((__GNU__ && __BMI2__ ) || (__clang__ && __BMI2INTRIN_H_))
+// __BMI2__ is idiomatic to gcc unfortunately.
+#if __x86_64__ && (__BMI2__ || (__clang__ && __BMI2INTRIN_H_))
 #pragma GCC diagnostic pop
         u64 random_split = ~(~0UL << _pext_u64(random_index, 8));
 #else