aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jie Fu <jiefu@openjdk.org> 2021-03-26 20:09:20 +0800
committerGravatar Jie Fu <jiefu@openjdk.org> 2021-03-26 20:09:20 +0800
commit6cba1e4ba44231e824271f8409ed2c97446c91d9 (patch)
tree436ecf2d091a43c8f5c1b609b5d6d7ce3ed35eb2
parente47dfb8e28ed2973da1346c3898f9386a7fa1fd3 (diff)
downloadjdk-pr/3216.tar.gz
jdk-pr/3216.zip
8264273: macOS: zero VM is broken due to no member named 'is_cpu_emulated' after JDK-8261966pr/3216
-rw-r--r--src/hotspot/os/bsd/os_bsd.cpp2
-rw-r--r--src/hotspot/share/runtime/os.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index 81334479489..c2d4df44d35 100644
--- 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
index b50d3d45ce9..6dbc860e1f9 100644
--- 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)");
}