8353217: Build libsleef on macos-aarch64

Co-authored-by: Magnus Ihse Bursie <[email protected]>
Reviewed-by: erikj, kvn, ihse

Author: Vladimir Ivanov

make/autoconf/flags-cflags.m4

@@ -924,8 +924,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   # Check whether the compiler supports the Arm C Language Extensions (ACLE)
   # for SVE. Set SVE_CFLAGS to -march=armv8-a+sve if it does.
   # ACLE and this flag are required to build the aarch64 SVE related functions in
-  # libvectormath.
-  if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+  # libvectormath. Apple Silicon does not support SVE; use macOS as a proxy for
+  # that check.
+  if test "x$OPENJDK_TARGET_CPU" = "xaarch64" && test "x$OPENJDK_TARGET_CPU" = "xlinux"; then
     if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
       AC_LANG_PUSH(C)
       OLD_CFLAGS="$CFLAGS"

make/modules/jdk.incubator.vector/Lib.gmk

@@ -27,51 +27,46 @@
 
 include LibCommon.gmk
 
-################################################################################
-## Build libjsvml
-################################################################################
+ifeq ($(INCLUDE_COMPILER2), true)
 
-ifeq ($(call isTargetOs, linux windows)+$(call isTargetCpu, x86_64)+$(INCLUDE_COMPILER2), true+true+true)
-  $(eval $(call SetupJdkLibrary, BUILD_LIBJSVML, \
-      NAME := jsvml, \
-      LDFLAGS_windows := -defaultlib:msvcrt, \
-  ))
+  ##############################################################################
+  ## Build libjsvml
+  ##############################################################################
 
-  TARGETS += $(BUILD_LIBJSVML)
-endif
+  ifeq ($(call isTargetOs, linux windows)+$(call isTargetCpu, x86_64), true+true)
+    $(eval $(call SetupJdkLibrary, BUILD_LIBJSVML, \
+        NAME := jsvml, \
+        LDFLAGS_windows := -defaultlib:msvcrt, \
+    ))
 
-################################################################################
-## Build libsleef
-################################################################################
+    TARGETS += $(BUILD_LIBJSVML)
+  endif
 
-ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, riscv64)+$(INCLUDE_COMPILER2), true+true+true)
-  $(eval $(call SetupJdkLibrary, BUILD_LIBSLEEF, \
-      NAME := sleef, \
-      OPTIMIZATION := HIGH, \
-      SRC := libsleef/lib, \
-      EXTRA_SRC := libsleef/generated, \
-      DISABLED_WARNINGS_gcc := unused-function sign-compare tautological-compare ignored-qualifiers, \
-      DISABLED_WARNINGS_clang := unused-function sign-compare tautological-compare ignored-qualifiers, \
-      CFLAGS := -march=rv64gcv, \
-      CFLAGS_FILTER_OUT := -ftrivial-auto-var-init=pattern, \
-  ))
+  ##############################################################################
+  ## Build libsleef
+  ##############################################################################
 
-  TARGETS += $(BUILD_LIBSLEEF)
-endif
+  ifeq ($(call isTargetOs, linux macosx)+$(call isTargetCpu, aarch64 riscv64), true+true)
+    ifeq ($(call isTargetCpu, riscv64), true)
+      LIBSLEEF_CFLAGS := -march=rv64gcv
+    endif
+
+    $(eval $(call SetupJdkLibrary, BUILD_LIBSLEEF, \
+        NAME := sleef, \
+        OPTIMIZATION := HIGH, \
+        SRC := libsleef/lib, \
+        EXTRA_SRC := libsleef/generated, \
+        DISABLED_WARNINGS_gcc := unused-function sign-compare \
+            tautological-compare ignored-qualifiers, \
+        DISABLED_WARNINGS_clang := unused-function sign-compare \
+            tautological-compare ignored-qualifiers, \
+        CFLAGS := $(LIBSLEEF_CFLAGS), \
+        vector_math_sve.c_CFLAGS := $(SVE_CFLAGS), \
+    ))
 
-ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, aarch64)+$(INCLUDE_COMPILER2), true+true+true)
-  $(eval $(call SetupJdkLibrary, BUILD_LIBSLEEF, \
-      NAME := sleef, \
-      OPTIMIZATION := HIGH, \
-      SRC := libsleef/lib, \
-      EXTRA_SRC := libsleef/generated, \
-      DISABLED_WARNINGS_gcc := unused-function sign-compare tautological-compare ignored-qualifiers, \
-      DISABLED_WARNINGS_clang := unused-function sign-compare tautological-compare ignored-qualifiers, \
-      vector_math_sve.c_CFLAGS := $(SVE_CFLAGS), \
-      CFLAGS_FILTER_OUT := -ftrivial-auto-var-init=pattern, \
-  ))
+    TARGETS += $(BUILD_LIBSLEEF)
+  endif
 
-  TARGETS += $(BUILD_LIBSLEEF)
 endif
 
 ################################################################################