From ea4ab3b31081a4344905929a9c911b0a53eeca45 Mon Sep 17 00:00:00 2001
From: Chris Sidebottom <chris.sidebottom@arm.com>
Date: Sat, 20 Jul 2024 13:39:22 +0000
Subject: [PATCH] Better header guard around bridge

---
 kernel/arm64/dgemm_small_kernel_nn_sve.c | 3 ++-
 kernel/arm64/dgemm_small_kernel_nt_sve.c | 3 ++-
 kernel/arm64/dgemm_small_kernel_tn_sve.c | 3 ++-
 kernel/arm64/dgemm_small_kernel_tt_sve.c | 3 ++-
 kernel/arm64/sgemm_small_kernel_nn_sve.c | 3 ++-
 kernel/arm64/sgemm_small_kernel_nt_sve.c | 3 ++-
 kernel/arm64/sgemm_small_kernel_tn_sve.c | 3 ++-
 kernel/arm64/sgemm_small_kernel_tt_sve.c | 3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/kernel/arm64/dgemm_small_kernel_nn_sve.c b/kernel/arm64/dgemm_small_kernel_nn_sve.c
index 417633471..fa39103d0 100644
--- a/kernel/arm64/dgemm_small_kernel_nn_sve.c
+++ b/kernel/arm64/dgemm_small_kernel_nn_sve.c
@@ -29,7 +29,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <arm_neon.h>
 #include <arm_sve.h>
-#ifdef __ARM_NEON_SVE_BRIDGE
+#if defined(__ARM_NEON_SVE_BRIDGE) && defined(__has_include) &&                \
+  __has_include(<arm_neon_sve_bridge.h>)
 #include <arm_neon_sve_bridge.h>
 #else
 #define svdup_neonq_f32(fixed_reg)                                             \
diff --git a/kernel/arm64/dgemm_small_kernel_nt_sve.c b/kernel/arm64/dgemm_small_kernel_nt_sve.c
index 241d96a6c..0b306e754 100644
--- a/kernel/arm64/dgemm_small_kernel_nt_sve.c
+++ b/kernel/arm64/dgemm_small_kernel_nt_sve.c
@@ -29,7 +29,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <arm_neon.h>
 #include <arm_sve.h>
-#ifdef __ARM_NEON_SVE_BRIDGE
+#if defined(__ARM_NEON_SVE_BRIDGE) && defined(__has_include) &&                \
+  __has_include(<arm_neon_sve_bridge.h>)
 #include <arm_neon_sve_bridge.h>
 #else
 #define svdup_neonq_f32(fixed_reg)                                             \
diff --git a/kernel/arm64/dgemm_small_kernel_tn_sve.c b/kernel/arm64/dgemm_small_kernel_tn_sve.c
index 1b0fada2a..daca8e1be 100644
--- a/kernel/arm64/dgemm_small_kernel_tn_sve.c
+++ b/kernel/arm64/dgemm_small_kernel_tn_sve.c
@@ -29,7 +29,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <arm_neon.h>
 #include <arm_sve.h>
-#ifdef __ARM_NEON_SVE_BRIDGE
+#if defined(__ARM_NEON_SVE_BRIDGE) && defined(__has_include) &&                \
+  __has_include(<arm_neon_sve_bridge.h>)
 #include <arm_neon_sve_bridge.h>
 #else
 #define svdup_neonq_f32(fixed_reg)                                             \
diff --git a/kernel/arm64/dgemm_small_kernel_tt_sve.c b/kernel/arm64/dgemm_small_kernel_tt_sve.c
index aa5bf2751..efe11a9f9 100644
--- a/kernel/arm64/dgemm_small_kernel_tt_sve.c
+++ b/kernel/arm64/dgemm_small_kernel_tt_sve.c
@@ -29,7 +29,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <arm_neon.h>
 #include <arm_sve.h>
-#ifdef __ARM_NEON_SVE_BRIDGE
+#if defined(__ARM_NEON_SVE_BRIDGE) && defined(__has_include) &&                \
+  __has_include(<arm_neon_sve_bridge.h>)
 #include <arm_neon_sve_bridge.h>
 #else
 #define svdup_neonq_f32(fixed_reg)                                             \
diff --git a/kernel/arm64/sgemm_small_kernel_nn_sve.c b/kernel/arm64/sgemm_small_kernel_nn_sve.c
index 0af073a14..8ea9cf5a7 100644
--- a/kernel/arm64/sgemm_small_kernel_nn_sve.c
+++ b/kernel/arm64/sgemm_small_kernel_nn_sve.c
@@ -29,7 +29,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <arm_neon.h>
 #include <arm_sve.h>
-#ifdef __ARM_NEON_SVE_BRIDGE
+#if defined(__ARM_NEON_SVE_BRIDGE) && defined(__has_include) &&                \
+  __has_include(<arm_neon_sve_bridge.h>)
 #include <arm_neon_sve_bridge.h>
 #else
 #define svdup_neonq_f32(fixed_reg)                                             \
diff --git a/kernel/arm64/sgemm_small_kernel_nt_sve.c b/kernel/arm64/sgemm_small_kernel_nt_sve.c
index ed7ee6bd6..ac7e067cd 100644
--- a/kernel/arm64/sgemm_small_kernel_nt_sve.c
+++ b/kernel/arm64/sgemm_small_kernel_nt_sve.c
@@ -29,7 +29,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <arm_neon.h>
 #include <arm_sve.h>
-#ifdef __ARM_NEON_SVE_BRIDGE
+#if defined(__ARM_NEON_SVE_BRIDGE) && defined(__has_include) &&                \
+  __has_include(<arm_neon_sve_bridge.h>)
 #include <arm_neon_sve_bridge.h>
 #else
 #define svdup_neonq_f32(fixed_reg)                                             \
diff --git a/kernel/arm64/sgemm_small_kernel_tn_sve.c b/kernel/arm64/sgemm_small_kernel_tn_sve.c
index 03406daa6..114640950 100644
--- a/kernel/arm64/sgemm_small_kernel_tn_sve.c
+++ b/kernel/arm64/sgemm_small_kernel_tn_sve.c
@@ -29,7 +29,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <arm_neon.h>
 #include <arm_sve.h>
-#ifdef __ARM_NEON_SVE_BRIDGE
+#if defined(__ARM_NEON_SVE_BRIDGE) && defined(__has_include) &&                \
+  __has_include(<arm_neon_sve_bridge.h>)
 #include <arm_neon_sve_bridge.h>
 #else
 #define svdup_neonq_f32(fixed_reg)                                             \
diff --git a/kernel/arm64/sgemm_small_kernel_tt_sve.c b/kernel/arm64/sgemm_small_kernel_tt_sve.c
index c66330fb5..731c9861b 100644
--- a/kernel/arm64/sgemm_small_kernel_tt_sve.c
+++ b/kernel/arm64/sgemm_small_kernel_tt_sve.c
@@ -29,7 +29,8 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <arm_neon.h>
 #include <arm_sve.h>
-#ifdef __ARM_NEON_SVE_BRIDGE
+#if defined(__ARM_NEON_SVE_BRIDGE) && defined(__has_include) &&                \
+  __has_include(<arm_neon_sve_bridge.h>)
 #include <arm_neon_sve_bridge.h>
 #else
 #define svdup_neonq_f32(fixed_reg)                                             \