Fold

robehn · Dec 20, 2024 · 0bd58ab · 0bd58ab
1 parent 64f79ef
commit 0bd58ab
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 25 deletions.
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
@@ -830,6 +830,22 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 
   FLAGS_SETUP_BRANCH_PROTECTION
 
+  if test "x$FLAGS_CPU" = xriscv64; then
+    AC_MSG_CHECKING([if RVV/vector sigcontext supported])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <linux/ptrace.h>],
+        [
+          return (int)sizeof(struct __riscv_v_ext_state);
+        ])],
+        [
+          AC_MSG_RESULT([yes])
+        ],
+        [
+          $1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -DNO_RVV_SIGCONTEXT"
+          AC_MSG_RESULT([no])
+        ]
+    )
+  fi
+
   # EXPORT to API
   CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
       $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
@@ -916,24 +932,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
     fi
   fi
   AC_SUBST($2SVE_CFLAGS)
-
-  if test "x$OPENJDK_TARGET_CPU" = "xriscv64"; then
-    AC_MSG_CHECKING([if RVV/vector sigcontext supported])
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <linux/ptrace.h>],
-        [
-          return (int)sizeof(struct __riscv_v_ext_state);
-        ])],
-        [
-          AC_MSG_RESULT([yes])
-          $2RVV_CFLAGS=""
-        ],
-        [
-          AC_MSG_RESULT([no])
-          $2RVV_CFLAGS="-DNO_RVV_SIGCONTEXT"
-        ]
-    )
-  fi
-  AC_SUBST($2RVV_CFLAGS)
 ])
 
 AC_DEFUN_ONCE([FLAGS_SETUP_BRANCH_PROTECTION],

diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
@@ -831,9 +831,6 @@ OS_VERSION_MICRO := @OS_VERSION_MICRO@
 # Arm SVE
 SVE_CFLAGS := @SVE_CFLAGS@
 
-# Riscv RVV
-RVV_CFLAGS := @RVV_CFLAGS@
-
 # Images directory definitions
 JDK_IMAGE_SUBDIR := jdk
 JRE_IMAGE_SUBDIR := jre

diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
@@ -135,10 +135,6 @@ else ifeq ($(call isTargetCpu, x86_64), true)
   JVM_EXCLUDE_PATTERNS += x86_32
 endif
 
-ifeq ($(call isTargetCpu, riscv64), true)
-  JVM_CFLAGS += $(RVV_CFLAGS)
-endif
-
 JVM_OPTIMIZATION ?= HIGHEST_JVM
 
 # Need to set JVM_STRIPFLAGS to the default value from SPEC since the STRIPFLAGS