[riscv64-8u]riscv.ad:695:10: fatal error: gc/shared/cardTableModRefBS.hpp: No such file or directory

[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/ad_riscv.o.d -fpch-deps -o ad_riscv-tmp.o ../generated/adfiles/ad_riscv.cpp
In file included from ../generated/adfiles/ad_riscv.cpp:31:
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/cpu/riscv/vm/riscv.ad:695:10: fatal error: gc/shared/cardTableModRefBS.hpp: No such file or directory
  695 | #include "gc/shared/cardTableModRefBS.hpp"
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

ad_riscv.log 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

[sendaoYan]

8079792: GC directory structure cleanup JDK-8079792.patch

[sendaoYan]

diff --git a/hotspot/src/cpu/riscv/vm/c1_MacroAssembler_riscv.cpp b/hotspot/src/cpu/riscv/vm/c1_MacroAssembler_riscv.cpp
index 99d981f97f4..42db17b8f04 100644
--- a/hotspot/src/cpu/riscv/vm/c1_MacroAssembler_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/c1_MacroAssembler_riscv.cpp
@@ -30,7 +30,7 @@
 #include "c1/c1_Runtime1.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
-#include "gc/shared/collectedHeap.hpp"
+#include "gc_interface/collectedHeap.hpp"
 #include "interpreter/interpreter.hpp"
 #include "oops/arrayOop.hpp"
 #include "runtime/basicLock.hpp"
diff --git a/hotspot/src/cpu/riscv/vm/icBuffer_riscv.cpp b/hotspot/src/cpu/riscv/vm/icBuffer_riscv.cpp
index cc93103dc55..bd40d8c6133 100644
--- a/hotspot/src/cpu/riscv/vm/icBuffer_riscv.cpp
+++ b/hotspot/src/cpu/riscv/vm/icBuffer_riscv.cpp
@@ -28,7 +28,7 @@
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "code/icBuffer.hpp"
-#include "gc/shared/collectedHeap.inline.hpp"
+#include "gc_interface/collectedHeap.inline.hpp"
 #include "interpreter/bytecodes.hpp"
 #include "memory/resourceArea.hpp"
 #include "nativeInst_riscv.hpp"
diff --git a/hotspot/src/cpu/riscv/vm/riscv.ad b/hotspot/src/cpu/riscv/vm/riscv.ad
index be2332bce2f..c15b9faf18a 100644
--- a/hotspot/src/cpu/riscv/vm/riscv.ad
+++ b/hotspot/src/cpu/riscv/vm/riscv.ad
@@ -692,7 +692,7 @@ definitions %{
 source_hpp %{

 #include "asm/macroAssembler.hpp"
-#include "gc/shared/cardTableModRefBS.hpp"
+#include "memory/cardTableModRefBS.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "opto/addnode.hpp"
 #include "opto/convertnode.hpp"

[sendaoYan]

16.patch ad_riscv.log make-riscv64.log To github.com:sendaoYan/riscv-port-jdk8u-ysd.git db26745e70a..67e79fa4f87 minus-jbs8276799 -> minus-jbs8276799