[riscv64-8u]c1_LIR.cpp:1228:5: error: "INCLUDE_ZGC" is not defined

[sendaoYan]

+ cd build/linux-riscv64-normal-server-release/hotspot/linux_riscv_compiler2/generated
+ /usr/bin/g++ -DLINUX -D_GNU_SOURCE -DRISCV64 -DPRODUCT -I. -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/prims -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/precompiled -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os_cpu/linux_riscv/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/linux/vm -I/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/os/posix/vm -I../generated '-DHOTSPOT_RELEASE_VERSION="25.412-b00"' '-DHOTSPOT_BUILD_TARGET="product"' '-DHOTSPOT_BUILD_USER="yansendao"' '-DHOTSPOT_LIB_ARCH="riscv64"' '-DHOTSPOT_VM_DISTRO="OpenJDK"' -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_riscv -DTARGET_ARCH_MODEL_riscv -DTARGET_OS_ARCH_linux_riscv -DTARGET_OS_ARCH_MODEL_linux_riscv64 -DTARGET_COMPILER_gcc -DINCLUDE_JFR=1 -DCOMPILER2 -DCOMPILER1 -fPIC -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -pipe -fno-strict-aliasing -fno-omit-frame-pointer -O3 -g -DVM_LITTLE_ENDIAN -D_LP64=1 -Werror -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wunused-value -Wformat=2 -Wreturn-type -fstack-protector -fno-delete-null-pointer-checks -fno-lifetime-dse -std=gnu++98 -DDTRACE_ENABLED -c -MMD -MP -MF ../generated/dependencies/c1_LIR.o.d -fpch-deps -o c1_LIR.o /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/c1/c1_LIR.cpp
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/c1/c1_LIR.cpp:1228:5: error: "INCLUDE_ZGC" is not defined, evaluates to 0 [-Werror=undef]
 1228 | #if INCLUDE_ZGC
      |     ^~~~~~~~~~~
cc1plus: all warnings being treated as errors

make-fastdebug-aarch64.log make-fastdebug-x86_64.log make-release-aarch64.log make-release-x86_64.log make-riscv64.log make-slowdebug-aarch64.log make-slowdebug-x86_64.log c1_LIR.cpp.log

[sendaoYan]

8204210: Implementation: JEP 333: ZGC: A Scalable Low-Latency Garbage Collector (Experimental)

[sendaoYan]

diff --git a/hotspot/src/cpu/riscv/vm/stubGenerator_riscv.cpp b/hotspot/src/cpu/riscv/vm/stubGenerator_riscv.cpp
index 44864df08f0..10b08629747 100644
--- a/hotspot/src/cpu/riscv/vm/stubGenerator_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/stubGenerator_riscv.cpp
@@ -48,9 +48,6 @@
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 #endif
-#if INCLUDE_ZGC
-#include "gc/z/zThreadLocalData.hpp"
-#endif

 // Declaration and definition of StubGenerator (no .hpp file).
 // For a more detailed description of the stub routine structure
diff --git a/hotspot/src/share/vm/c1/c1_LIR.cpp b/hotspot/src/share/vm/c1/c1_LIR.cpp
index 8ca42f8d445..d9cbe9c8836 100644
--- a/hotspot/src/share/vm/c1/c1_LIR.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIR.cpp
@@ -1225,12 +1225,6 @@ void LIR_List::set_cmp_oprs(LIR_Op* op) {
       op->as_Op4()->set_in_opr3(_cmp_opr1);
       op->as_Op4()->set_in_opr4(_cmp_opr2);
       break;
-#if INCLUDE_ZGC
-    case lir_zloadbarrier_test:
-      _cmp_opr1 = FrameMap::as_opr(t1);
-      _cmp_opr2 = LIR_OprFact::intConst(0);
-      break;
-#endif
     default:
       break;
   }
diff --git a/hotspot/src/share/vm/c1/c1_LIR.hpp b/hotspot/src/share/vm/c1/c1_LIR.hpp
index 48029e5afcc..a8d0e091032 100644
--- a/hotspot/src/share/vm/c1/c1_LIR.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIR.hpp
@@ -1016,11 +1016,6 @@ enum LIR_Code {
   , begin_opAssert
     , lir_assert
   , end_opAssert
-#ifdef INCLUDE_ZGC
-  , begin_opZLoadBarrierTest
-    , lir_zloadbarrier_test
-  , end_opZLoadBarrierTest
-#endif
 };

[sendaoYan]

c1_LIR.cpp.log make-riscv64.log To github.com:sendaoYan/riscv-port-jdk8u-ysd.git 8de1444d91f..4ce337f65a4 minus-jbs8276799 -> minus-jbs8276799

[sendaoYan]

40.patch

[sendaoYan]

make-fastdebug-aarch64.log make-fastdebug-x86_64.log make-release-aarch64.log make-release-x86_64.log make-slowdebug-aarch64.log make-slowdebug-x86_64.log