8264273: macOS: zero VM is broken due to no member named 'is_cpu_emulated' after JDK-8261966

DamonFool · DamonFool · commit 38e0a58f6c52 · 2021-03-27T09:54:11.000Z
Reviewed-by: iklam
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1404,7 +1404,7 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {
   }
 
   const char* emulated = "";
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(ZERO)
   if (VM_Version::is_cpu_emulated()) {
     emulated = " (EMULATED)";
   }
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
@@ -1033,7 +1033,7 @@ void os::print_environment_variables(outputStream* st, const char** env_list) {
 void os::print_cpu_info(outputStream* st, char* buf, size_t buflen) {
   // cpu
   st->print("CPU:");
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(ZERO)
    if (VM_Version::is_cpu_emulated()) {
      st->print(" (EMULATED)");
    }

Original file line number	Diff line number	Diff line change
`@@ -1404,7 +1404,7 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {`
`1404`	`1404`	`}`
`1405`	`1405`
`1406`	`1406`	`const char* emulated = "";`
`1407`		`-#ifdef __APPLE__`
	`1407`	`+#if defined(__APPLE__) && !defined(ZERO)`
`1408`	`1408`	`if (VM_Version::is_cpu_emulated()) {`
`1409`	`1409`	`emulated = " (EMULATED)";`
`1410`	`1410`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1033,7 +1033,7 @@ void os::print_environment_variables(outputStream* st, const char** env_list) {`
`1033`	`1033`	`void os::print_cpu_info(outputStream* st, char* buf, size_t buflen) {`
`1034`	`1034`	`// cpu`
`1035`	`1035`	`st->print("CPU:");`
`1036`		`-#ifdef __APPLE__`
	`1036`	`+#if defined(__APPLE__) && !defined(ZERO)`
`1037`	`1037`	`if (VM_Version::is_cpu_emulated()) {`
`1038`	`1038`	`st->print(" (EMULATED)");`
`1039`	`1039`	`}`