Open sendaoYan opened 1 week ago
8233787: Break cycle in vm_version* includes
diff --git a/hotspot/src/cpu/riscv/vm/vm_version_riscv.hpp b/hotspot/src/cpu/riscv/vm/vm_version_riscv.hpp
index 7586af01d99..2da50c62135 100644
--- a/hotspot/src/cpu/riscv/vm/vm_version_riscv.hpp
+++ b/hotspot/src/cpu/riscv/vm/vm_version_riscv.hpp
@@ -27,7 +27,7 @@
#ifndef CPU_RISCV_VM_VERSION_RISCV_HPP
#define CPU_RISCV_VM_VERSION_RISCV_HPP
-#include "runtime/abstract_vm_version.hpp"
+#include "runtime/vm_version.hpp"
#include "runtime/arguments.hpp"
#include "runtime/globals_extension.hpp"
#include "utilities/sizes.hpp"
diff --git a/hotspot/src/share/vm/classfile/classFileStream.hpp b/hotspot/src/share/vm/classfile/classFileStream.hpp
index 9632c8c8c24..c311159250f 100644
--- a/hotspot/src/share/vm/classfile/classFileStream.hpp
+++ b/hotspot/src/share/vm/classfile/classFileStream.hpp
@@ -32,6 +32,9 @@
#ifdef TARGET_ARCH_aarch64
# include "bytes_aarch64.hpp"
#endif
+#ifdef TARGET_ARCH_riscv
+# include "bytes_riscv.hpp"
+#endif
#ifdef TARGET_ARCH_sparc
# include "bytes_sparc.hpp"
#endif
build-precompiled.log make-riscv64.log