commit 386707c6d19b974ca2e3db7f5c61873813c6fe44
author Ryan VanderMeulen <rvandermeulen@mozilla.com> Tue Apr 16 12:51:06 2019 -0400
committer Cosmin Truta <ctruta@gmail.com> Wed Apr 24 23:57:14 2019 -0400
tree 3ca0f4f7fe439287e4526708c610ea1365010d87
parent 216387f6f7ee043df24a84ab2dc53d2827148b5e

arm: Use <arm_neon.h> when compiling aarch64 intrinsics with clang-cl

MSVC's <arm64_neon.h> header contains cl.exe intrinsics that are not
recognized by clang-cl.

Contributed-by: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Contributed-by: Mike Klein <mtklein@google.com>
Signed-off-by: Cosmin Truta <ctruta@gmail.com>

arm/filter_neon_intrinsics.c

diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c
index 553c0be..4466d48 100644
--- a/arm/filter_neon_intrinsics.c
+++ b/arm/filter_neon_intrinsics.c
@@ -18,7 +18,7 @@
 /* This code requires -mfpu=neon on the command line: */
 #if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
 
-#if defined(_MSC_VER) && defined(_M_ARM64)
+#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64)
 #  include <arm64_neon.h>
 #else
 #  include <arm_neon.h>

arm/palette_neon_intrinsics.c

diff --git a/arm/palette_neon_intrinsics.c b/arm/palette_neon_intrinsics.c
index 00ddcef..49909d4 100644
--- a/arm/palette_neon_intrinsics.c
+++ b/arm/palette_neon_intrinsics.c
@@ -14,7 +14,7 @@
 
 #if PNG_ARM_NEON_IMPLEMENTATION == 1
 
-#if defined(_MSC_VER) && defined(_M_ARM64)
+#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64)
 #  include <arm64_neon.h>
 #else
 #  include <arm_neon.h>

pngrtran.c

diff --git a/pngrtran.c b/pngrtran.c
index 9a8fad9..238f5af 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -21,7 +21,7 @@
 #ifdef PNG_ARM_NEON_IMPLEMENTATION
 #  if PNG_ARM_NEON_IMPLEMENTATION == 1
 #    define PNG_ARM_NEON_INTRINSICS_AVAILABLE
-#    if defined(_MSC_VER) && defined(_M_ARM64)
+#    if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64)
 #      include <arm64_neon.h>
 #    else
 #      include <arm_neon.h>