From 744e0893100d402b2b51762d57bcc2e99ab7fdcc Mon Sep 17 00:00:00 2001 From: Aleksey Shipilev Date: Thu, 26 Oct 2023 12:34:45 +0000 Subject: [PATCH] 8318700: MacOS Zero cannot run gtests due to wrong JVM path Reviewed-by: dholmes --- src/hotspot/os/bsd/os_bsd.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp index 31c33d43612..a38aa09d084 100644 --- a/src/hotspot/os/bsd/os_bsd.cpp +++ b/src/hotspot/os/bsd/os_bsd.cpp @@ -202,11 +202,13 @@ static char cpu_arch[] = "ppc"; #error Add appropriate cpu_arch setting #endif -// Compiler variant -#ifdef COMPILER2 - #define COMPILER_VARIANT "server" +// JVM variant +#if defined(ZERO) + #define JVM_VARIANT "zero" +#elif defined(COMPILER2) + #define JVM_VARIANT "server" #else - #define COMPILER_VARIANT "client" + #define JVM_VARIANT "client" #endif @@ -1501,10 +1503,10 @@ void os::jvm_path(char *buf, jint buflen) { snprintf(jrelib_p, buflen-len, "/lib"); } - // Add the appropriate client or server subdir + // Add the appropriate JVM variant subdir len = strlen(buf); jrelib_p = buf + len; - snprintf(jrelib_p, buflen-len, "/%s", COMPILER_VARIANT); + snprintf(jrelib_p, buflen-len, "/%s", JVM_VARIANT); if (0 != access(buf, F_OK)) { snprintf(jrelib_p, buflen-len, "%s", ""); }