Skip to content

Commit 1a9cf8e

Browse files
authored
Merge pull request #5631 from martin-frbg/issue5626n
Fix CMake/LLVM compilation issues seen under Windows-on-Arm
2 parents 27e35d6 + 69d9249 commit 1a9cf8e

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

cmake/system.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ if (${TARGET} STREQUAL NEOVERSEV1)
381381
if (${CMAKE_C_COMPILER_ID} STREQUAL "PGI" AND NOT NO_SVE)
382382
set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -Msve-intrinsics -march=armv8.2-a+sve -mtune=a64fx")
383383
else ()
384+
set (GCC_VERSION 0.0)
384385
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
385386
if (${GCC_VERSION} VERSION_GREATER 10.4 OR ${GCC_VERSION} VERSION_EQUAL 10.4)
386387
set (KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS} -march=armv8.2-a+sve -mtune=a64fx")

driver/others/dynamic_arm64.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
/*********************************************************************/
3939

4040
#include "common.h"
41+
#include <strings.h>
4142
#if (defined OS_LINUX || defined OS_ANDROID)
4243
#include <asm/hwcap.h>
4344
#include <sys/auxv.h>

kernel/arm64/sgemm_direct_alpha_beta_arm64_sme1.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <stdlib.h>
88
#include <inttypes.h>
99
#include <math.h>
10-
#include "sme_abi.h"
1110

1211
#if defined(DYNAMIC_ARCH)
1312
#define COMBINE(a,b) a ## b
@@ -26,6 +25,7 @@ extern void SME1_PREPROCESS(uint64_t nbr, uint64_t nbc,\
2625
const float * restrict a, float * a_mod);
2726

2827
#if defined(HAVE_SME)
28+
#include "sme_abi.h"
2929

3030
#if defined(__ARM_FEATURE_SME) && defined(__clang__) && __clang_major__ >= 16
3131
#include <arm_sme.h>
@@ -214,3 +214,4 @@ void CNAME (BLASLONG M, BLASLONG N, BLASLONG K, float alpha, float * __restrict
214214
float beta, float * __restrict R, BLASLONG strideR){fprintf(stderr,"empty sgemm_direct_alpha_beta should not be called!!!\n");}
215215
#endif
216216

217+

0 commit comments

Comments
 (0)