# HG changeset patch
# User aoqi
# Date 1532409731 -28800
# Node ID dc1769738300f51bb9cf057e2d50320d843c2049
# Parent  7ed87d5663da8a4a5d72f415932a4d57a5ed90d9
#7048 added Loongson release info to hs_err crash files

diff -r 7ed87d5663da -r dc1769738300 make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make	Fri May 25 14:48:32 2018 +0800
+++ b/make/linux/makefiles/vm.make	Tue Jul 24 13:22:11 2018 +0800
@@ -23,8 +23,8 @@
 #
 
 #
-# This file has been modified by Loongson Technology in 2015. These
-# modifications are Copyright (c) 2015 Loongson Technology, and are made
+# This file has been modified by Loongson Technology in 2018. These
+# modifications are Copyright (c) 2018 Loongson Technology, and are made
 # available on the same license terms set forth above.
 #
 
@@ -115,6 +115,12 @@
 # This is VERY important! The version define must only be supplied to vm_version.o
 # If not, ccache will not re-use the cache at all, since the version string might contain
 # a time and date.
+ifdef LOONGSON_RUNTIME_NAME
+  LOONGSON_VM_INFO = -DLOONGSON_RUNTIME_NAME="\"$(LOONGSON_RUNTIME_NAME)\""
+else
+  LOONGSON_VM_INFO = -DLOONGSON_RUNTIME_NAME="\"\""
+endif
+CXXFLAGS/vmError.o += ${LOONGSON_VM_INFO}
 CXXFLAGS/vm_version.o += ${JRE_VERSION}
 
 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
diff -r 7ed87d5663da -r dc1769738300 src/share/vm/utilities/vmError.cpp
--- a/src/share/vm/utilities/vmError.cpp	Fri May 25 14:48:32 2018 +0800
+++ b/src/share/vm/utilities/vmError.cpp	Tue Jul 24 13:22:11 2018 +0800
@@ -22,6 +22,13 @@
  *
  */
 
+/*
+ * This file has been modified by Loongson Technology in 2018. These
+ * modifications are Copyright (c) 2018 Loongson Technology, and are made
+ * available on the same license terms set forth above.
+ *
+*/
+
 #include <fcntl.h>
 #include "precompiled.hpp"
 #include "compiler/compileBroker.hpp"
@@ -461,7 +468,12 @@
                                   JDK_Version::runtime_name() : "";
      const char* runtime_version = JDK_Version::runtime_version() != NULL ?
                                   JDK_Version::runtime_version() : "";
-     st->print_cr("# JRE version: %s (%s) (build %s)", runtime_name, buf, runtime_version);
+#ifdef LOONGSON_RUNTIME_NAME
+     const char* loongson_runtime_name_and_version = LOONGSON_RUNTIME_NAME;
+#else
+     const char* loongson_runtime_name_and_version = "";
+#endif
+     st->print_cr("# JRE version: %s (%s) (build %s) (%s)", runtime_name, buf, runtime_version, loongson_runtime_name_and_version);
      st->print_cr("# Java VM: %s (%s %s %s %s)",
                    Abstract_VM_Version::vm_name(),
                    Abstract_VM_Version::vm_release(),