Backport 3f7052ed7af89efd1c6977df0b4f3b95fcfec764

duke · duke · commit 6cd63fba6399 · 2025-01-10T12:23:08.000Z
diff --git a/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp b/src/hotspot/cpu/riscv/codeBuffer_riscv.hpp
@@ -33,6 +33,6 @@
 
 public:
   void flush_bundle(bool start_new_bundle) {}
-  static bool supports_shared_stubs() { return false; }
+  static bool supports_shared_stubs() { return true; }
 
 #endif // CPU_RISCV_CODEBUFFER_RISCV_HPP
diff --git a/test/hotspot/jtreg/compiler/sharedstubs/SharedTrampolineTest.java b/test/hotspot/jtreg/compiler/sharedstubs/SharedTrampolineTest.java
@@ -30,7 +30,7 @@
  *
  * @requires vm.compiler2.enabled
  * @requires vm.opt.TieredCompilation == null
- * @requires os.arch=="aarch64" | os.arch=="riscv64"
+ * @requires os.arch=="aarch64"
  * @requires vm.debug
  *
  * @run driver compiler.sharedstubs.SharedTrampolineTest -XX:-TieredCompilation

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`* @requires vm.compiler2.enabled`
`32`	`32`	`* @requires vm.opt.TieredCompilation == null`
`33`		`- * @requires os.arch=="aarch64" \| os.arch=="riscv64"`
	`33`	`+ * @requires os.arch=="aarch64"`
`34`	`34`	`* @requires vm.debug`
`35`	`35`	`*`
`36`	`36`	`* @run driver compiler.sharedstubs.SharedTrampolineTest -XX:-TieredCompilation`