aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-07-08 12:25:37 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-07-08 12:25:37 -0700
commit7ad42cfe87d07f20e629be5685b1507df931dd9e (patch)
treebee3286735e4ea307ef98e15f0da98fd8f5c37b7
parente5e3a7a5203f256083d015c923cc9c662877aba9 (diff)
Corrected test for gcc/libc++ workaround.
NOTREECHECKS=true NOTRY=true The presubmit bot is all hung up. Review-Url: https://codereview.chromium.org/2136613002
-rw-r--r--include/core/SkTypes.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index b38268231d..1ac3efb221 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -17,9 +17,10 @@
// before #including <memory>. This makes no sense. I'm not very interested in
// understanding why... these are old, bizarre platform configuration that we
// should just let die.
+// See https://llvm.org/bugs/show_bug.cgi?id=25608 .
#include <ciso646> // Include something innocuous to define _LIBCPP_VERISON if it's libc++.
#if defined(__GNUC__) && __GNUC__ == 4 \
- && ((defined(SK_CPU_ARM32) && defined(SK_ARM_HAS_NEON)) || defined(SK_CPU_ARM64)) \
+ && ((defined(__arm__) && (defined(__ARM_NEON__) || defined(__ARM_NEON))) || defined(__aarch64__)) \
&& defined(_LIBCPP_VERSION)
typedef float float32_t;
#include <memory>