Backport 7540fa2147ff8fc9c652ef13548f72f27e2809a8

duke · duke · commit 2714827154f8 · 2024-11-20T03:49:23.000Z
diff --git a/src/hotspot/cpu/s390/vm_version_s390.cpp b/src/hotspot/cpu/s390/vm_version_s390.cpp
@@ -302,6 +302,12 @@ void VM_Version::initialize() {
   if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) {
     FLAG_SET_DEFAULT(UseUnalignedAccesses, true);
   }
+
+  // The OptoScheduling information is not maintained in s390.ad.
+  if (OptoScheduling) {
+    warning("OptoScheduling is not supported on this CPU.");
+    FLAG_SET_DEFAULT(OptoScheduling, false);
+  }
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,12 @@ void VM_Version::initialize() {`
`302`	`302`	`if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) {`
`303`	`303`	`FLAG_SET_DEFAULT(UseUnalignedAccesses, true);`
`304`	`304`	`}`
	`305`	`+`
	`306`	`+ // The OptoScheduling information is not maintained in s390.ad.`
	`307`	`+ if (OptoScheduling) {`
	`308`	`+ warning("OptoScheduling is not supported on this CPU.");`
	`309`	`+ FLAG_SET_DEFAULT(OptoScheduling, false);`
	`310`	`+ }`
`305`	`311`	`}`
`306`	`312`
`307`	`313`