Merge pull request #603 from ibmruntimes/openj9

Merge latest OpenJ9 change to 0.36
ibmruntimes · Dec 13, 2022 · 0839f3f · 0839f3f
2 parents 2451aad + c277aa4
commit 0839f3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
@@ -318,6 +318,7 @@ OPENJ9_VERSION_VARS := \
 	OPENJDK_TARGET_CPU_OSARCH \
 	OPENJDK_TARGET_OS \
 	PRODUCT_NAME \
+	PRODUCT_SUFFIX \
 	USERNAME \
 	VENDOR_URL \
 	VERSION_STRING \

diff --git a/closed/openj9_version_info.h.in b/closed/openj9_version_info.h.in
@@ -1,6 +1,6 @@
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2017, 2020 All Rights Reserved
+ * (c) Copyright IBM Corp. 2017, 2022 All Rights Reserved
  * ===========================================================================
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #define OPENJ9_VERSION_INFO_H
 
 #define J9COMPILER_VERSION_STRING "@COMPILER_VERSION_STRING@"
-#define J9PRODUCT_NAME            "@PRODUCT_NAME@"
+#define J9PRODUCT_NAME            "@PRODUCT_NAME@ @PRODUCT_SUFFIX@"
 #define J9TARGET_CPU_BITS         "@OPENJDK_TARGET_CPU_BITS@"
 #define J9TARGET_CPU_OSARCH       "@OPENJDK_TARGET_CPU_OSARCH@"
 #define J9TARGET_OS               "@OPENJDK_TARGET_OS@"