From dc30e686516d50bdc65542d440e1e428362efb67 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 22 May 2023 12:23:45 +0000 Subject: [PATCH] 8308407: libjvm library not reproducibly comparable between vendors Co-authored-by: Simon Tooke Reviewed-by: andrew, dholmes --- src/hotspot/share/runtime/abstract_vm_version.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp index aff9b9e5e52..2fdb820982a 100644 --- a/src/hotspot/share/runtime/abstract_vm_version.cpp +++ b/src/hotspot/share/runtime/abstract_vm_version.cpp @@ -116,13 +116,17 @@ const char* Abstract_VM_Version::vm_name() { return VMNAME; } +#ifndef VENDOR_PADDING +# define VENDOR_PADDING 64 +#endif +#ifndef VENDOR +# define VENDOR "Oracle Corporation" +#endif + +static const char vm_vendor_string[sizeof(VENDOR) < VENDOR_PADDING ? VENDOR_PADDING : sizeof(VENDOR)] = VENDOR; const char* Abstract_VM_Version::vm_vendor() { -#ifdef VENDOR - return VENDOR; -#else - return "Oracle Corporation"; -#endif + return vm_vendor_string; }