# HG changeset patch
# User simonis
# Date 1437989108 -7200
#      Mon Jul 27 11:25:08 2015 +0200
# Node ID 6cfd033f0f8b05862e151799226364ace94caa2c
# Parent  06c8b6dc07a2ed4b79198893f9d9d0c86347a692
8132374: AIX: fix value of os.version property

diff --git a/src/java.base/unix/native/libjava/java_props_md.c b/src/java.base/unix/native/libjava/java_props_md.c
--- a/src/java.base/unix/native/libjava/java_props_md.c
+++ b/src/java.base/unix/native/libjava/java_props_md.c
@@ -503,8 +503,21 @@
         struct utsname name;
         uname(&name);
         sprops.os_name = strdup(name.sysname);
+#ifdef _AIX
+        {
+            char *os_version = malloc(strlen(name.version) +
+                                      strlen(name.release) + 2);
+            if (os_version != NULL) {
+                strcpy(os_version, name.version);
+                strcat(os_version, ".");
+                strcat(os_version, name.release);
+            }
+            sprops.os_version = os_version;
+        }
+#else
         sprops.os_version = strdup(name.release);
-#endif
+#endif /* _AIX   */
+#endif /* MACOSX */
 
         sprops.os_arch = ARCHPROPNAME;