Merge pull request #5829 from martin-frbg/issue5825

Fix OpenMP reentrancy issues in LLVM compilations with gmake on ARM64

Author: martin-frbg

Makefile.arm64

@@ -310,12 +310,10 @@ endif
 
 ifeq ($(CORE), VORTEXM4)
 ifneq ($(C_COMPILER), GCC)
-ifeq ($(APPLECLANG),1)
 CCOMMON_OPT += -march=armv8.4-a+sme
-else
-CCOMMON_OPT += -march=armv8.4-a+sme
-override LDFLAGS += -lclang_rt_builtins-aarch64
-endif
+#ifneq ($(APPLECLANG),1)
+#override LDFLAGS += -lclang_rt_builtins-aarch64
+#endif
 else
 CCOMMON_OPT += -march=armv8.4-a
 endif

c_check

@@ -342,8 +342,8 @@ no_sme=0
 is_appleclang=0
 if [ "$architecture" = "arm64" ]; then
     if [ "$compiler" = "CLANG" ]; then
-        data=`$compiler_name --version`
-	case "$data" in Apple*)
+        vdata=`$compiler_name --version`
+	case "$vdata" in Apple*)
 	is_appleclang=1
 	esac
     fi

kernel/Makefile

@@ -38,12 +38,10 @@ ifeq ($(TARGET_CORE), VORTEXM4)
   ifeq ($(C_COMPILER), GCC)
     override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE) -UHAVE_SME -march=armv8.4-a
   else
-    ifeq ($(APPLECLANG),1)
-      override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE) -march=armv8.4-a+sme
-    else
-      override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE) -march=armv8.4-a+sme
-	  override LDFLAGS += -lclang_rt_builtins-aarch64
-    endif
+    override CFLAGS += -DBUILD_KERNEL -DTABLE_NAME=gotoblas_$(TARGET_CORE) -march=armv8.4-a+sme
+#   ifneq ($(APPLECLANG),1)
+#     override LDFLAGS += -lclang_rt_builtins-aarch64
+#   endif
     ifdef OS_WINDOWS
       ifeq ($(C_COMPILER), CLANG)
         override CFLAGS += --aarch64-stack-hazard-size=0