Add define of __MAP_64

When OMRPORT_MMAP_FLAG_ZOS_64BIT is passed in, we set flag __MAP_64 on z/OS version 2.4 and up. Related to eclipse-openj9/openj9#17073 Signed-off-by: Hang Shao <hangshao@ca.ibm.com>
eclipse · May 12, 2023 · d05ecf3 · d05ecf3
1 parent 779c51b
commit d05ecf3
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/include_core/omrutil.h b/include_core/omrutil.h
@@ -300,6 +300,18 @@ omr_error_t detectVMDirectory(wchar_t *vmDirectory, size_t vmDirectoryLength, wc
 
 uintptr_t getStorageKey(void);
 
+/* ---------------- zosversion.c ---------------- */
+
+/**
+ * Function to determine if the zos version is at least a given
+ * release and version.  The implementation is based on uname(),
+ * NOT on __osname() as the __osname() release numbers are not
+ * guaranteed to increase.
+ *
+ * For release and version numbers, see
+ * 	https://www.ibm.com/docs/en/zos/2.5.0?topic=functions-uname-display-current-operating-system-name
+ */
+BOOLEAN zos_version_at_least(double min_release, double min_version)
 #endif /*if defined(J9ZOS390)*/
 
 /**

diff --git a/port/unix/omrmmap.c b/port/unix/omrmmap.c
@@ -56,6 +56,14 @@
 #endif /* !defined(MAP_FAILED) */
 #endif /* defined(J9ZOS390) */
 
+#if defined(J9ZOS39064)
+#if !defined(__MAP_64)
+#define __MAP_64 0x10
+#endif /* !defined(__MAP_64) */
+#define ZOS_V2R4_RELEASE 27.00
+#define ZOS_V2R4_VERSION 4
+#endif /* defined(J9ZOS39064) */
+
 #if defined(AIXPPC)
 #include <sys/shm.h>
 #include <sys/vminfo.h>
@@ -205,11 +213,21 @@ omrmmap_map_file(struct OMRPortLibrary *portLibrary, intptr_t file, uint64_t off
 		spCount++;
 	}
 
-#if defined(J9ZOS39064) && defined(__MAP_64)
+#if defined(J9ZOS39064)
 	if (OMR_ARE_ANY_BITS_SET(flags, OMRPORT_MMAP_FLAG_ZOS_64BIT)) {
-		mmapFlags |= __MAP_64;
+		if (zos_version_at_least(ZOS_V2R4_RELEASE, ZOS_V2R4_VERSION)) {
+			mmapFlags |= __MAP_64;
+		} else {
+			Trc_PRT_mmap_map_file_unix_invalidFlags();
+			errMsg = portLibrary->nls_lookup_message(portLibrary,
+						J9NLS_ERROR | J9NLS_DO_NOT_APPEND_NEWLINE,
+						J9NLS_PORT_MMAP_INVALID_MEMORY_PROTECTION,
+						NULL);
+			portLibrary->error_set_last_error_with_message(portLibrary, OMRPORT_ERROR_MMAP_MAP_FILE_INVALIDFLAGS, errMsg);
+			return NULL;
+		}
 	}
-#endif /* defined(J9ZOS39064) && defined(__MAP_64) */
+#endif /* defined(J9ZOS39064) */
 
 	if (1 != rwCount) {
 		Trc_PRT_mmap_map_file_unix_invalidFlags();