Corrected test for gcc/libc++ workaround.

include/core/SkTypes.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTypes_DEFINED
 #define SkTypes_DEFINED
 
 // IWYU pragma: begin_exports
 
 // In at least two known scenarios when using GCC with libc++:
 //  * GCC 4.8 targeting ARMv7 with NEON
 //  * GCC 4.9 targeting ARMv8 64 bit
 // we need to typedef float float32_t (or include <arm_neon.h> which does that)
 // 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>
 #endif
 
 #include "SkPreConfig.h"
 #include "SkUserConfig.h"
 #include "SkPostConfig.h"
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 682 matching lines @@
 
     void*       fPtr;
     size_t      fSize;  // can be larger than the requested size (see kReuse)
     uint32_t    fStorage[kSize >> 2];
 };
 // Can't guard the constructor because it's a template class.
 
 #endif /* C++ */
 
 #endif