[riscv64-8u]atomic.inline.hpp:50:11: fatal error: atomic_linux_riscv.inline.hpp: No such file or directory

[sendaoYan]

/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/precompiled.hpp.gch.d -fpch-deps -x c++-header /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/precompiled/precompiled.hpp -o precompiled.hpp.gch && { echo Done with /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/precompiled/precompiled.hpp; }
In file included from /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/memory/allocation.inline.hpp:28,
                 from /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/utilities/array.hpp:29,
                 from /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/memory/universe.hpp:29,
                 from /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/code/oopRecorder.hpp:28,
                 from /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/asm/codeBuffer.hpp:28,
                 from /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/asm/assembler.hpp:28,
                 from /home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/precompiled/precompiled.hpp:29:
/home/yansendao/git/riscv-port-jdk8u-ysd/hotspot/src/share/vm/runtime/atomic.inline.hpp:50:11: fatal error: atomic_linux_riscv.inline.hpp: No such file or directory
   50 | # include "atomic_linux_riscv.inline.hpp"
      |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.

build-precompiled.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]

8157907: Incorrect inclusion of atomic.hpp instead of atomic.inline.hpp

[sendaoYan]

git mv hotspot/src/os_cpu/linux_riscv/vm/atomic_linux_riscv.hpp hotspot/src/os_cpu/linux_riscv/vm/atomic_linux_riscv.inline.hpp

[sendaoYan]

diff --git a/hotspot/src/os_cpu/linux_riscv/vm/atomic_linux_riscv.inline.hpp b/hotspot/src/os_cpu/linux_riscv/vm/atomic_linux_riscv.inline.hpp
index 9b8b1a31774..d2c3259808e 100644
--- a/hotspot/src/os_cpu/linux_riscv/vm/atomic_linux_riscv.inline.hpp
+++ b/hotspot/src/os_cpu/linux_riscv/vm/atomic_linux_riscv.inline.hpp
@@ -23,10 +23,12 @@
  *
  */

-#ifndef OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_HPP
-#define OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_HPP
+#ifndef OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_INLINE_HPP
+#define OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_INLINE_HPP

-#include "runtime/vm_version.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/os.hpp"
+#include "vm_version_riscv.hpp"

 // Implementation of class atomic

@@ -116,4 +118,4 @@ inline T Atomic::PlatformCmpxchg<4>::operator()(T exchange_value,
   return rv;
 }

-#endif // OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_HPP
+#endif // OS_CPU_LINUX_RISCV_ATOMIC_LINUX_RISCV_INLINE_HPP

[sendaoYan]

8233787: Break cycle in vm_version* includes

[sendaoYan]

To github.com:sendaoYan/riscv-port-jdk8u-ysd.git 9152eb54be9..0a16b6efc42 minus-jbs8276799 -> minus-jbs8276799