Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/linux/makefiles/vm.make	Fri May 25 14:48:32 2018 +0800
     1.2 +++ b/make/linux/makefiles/vm.make	Tue Jul 24 13:22:11 2018 +0800
     1.3 @@ -23,8 +23,8 @@
     1.4  #
     1.5  
     1.6  #
     1.7 -# This file has been modified by Loongson Technology in 2015. These
     1.8 -# modifications are Copyright (c) 2015 Loongson Technology, and are made
     1.9 +# This file has been modified by Loongson Technology in 2018. These
    1.10 +# modifications are Copyright (c) 2018 Loongson Technology, and are made
    1.11  # available on the same license terms set forth above.
    1.12  #
    1.13  
    1.14 @@ -115,6 +115,12 @@
    1.15  # This is VERY important! The version define must only be supplied to vm_version.o
    1.16  # If not, ccache will not re-use the cache at all, since the version string might contain
    1.17  # a time and date.
    1.18 +ifdef LOONGSON_RUNTIME_NAME
    1.19 +  LOONGSON_VM_INFO = -DLOONGSON_RUNTIME_NAME="\"$(LOONGSON_RUNTIME_NAME)\""
    1.20 +else
    1.21 +  LOONGSON_VM_INFO = -DLOONGSON_RUNTIME_NAME="\"\""
    1.22 +endif
    1.23 +CXXFLAGS/vmError.o += ${LOONGSON_VM_INFO}
    1.24  CXXFLAGS/vm_version.o += ${JRE_VERSION}
    1.25  
    1.26  CXXFLAGS/BYFILE = $(CXXFLAGS/$@)

     2.1 --- a/src/share/vm/utilities/vmError.cpp	Fri May 25 14:48:32 2018 +0800
     2.2 +++ b/src/share/vm/utilities/vmError.cpp	Tue Jul 24 13:22:11 2018 +0800
     2.3 @@ -22,6 +22,13 @@
     2.4   *
     2.5   */
     2.6  
     2.7 +/*
     2.8 + * This file has been modified by Loongson Technology in 2018. These
     2.9 + * modifications are Copyright (c) 2018 Loongson Technology, and are made
    2.10 + * available on the same license terms set forth above.
    2.11 + *
    2.12 +*/
    2.13 +
    2.14  #include <fcntl.h>
    2.15  #include "precompiled.hpp"
    2.16  #include "compiler/compileBroker.hpp"
    2.17 @@ -461,7 +468,12 @@
    2.18                                    JDK_Version::runtime_name() : "";
    2.19       const char* runtime_version = JDK_Version::runtime_version() != NULL ?
    2.20                                    JDK_Version::runtime_version() : "";
    2.21 -     st->print_cr("# JRE version: %s (%s) (build %s)", runtime_name, buf, runtime_version);
    2.22 +#ifdef LOONGSON_RUNTIME_NAME
    2.23 +     const char* loongson_runtime_name_and_version = LOONGSON_RUNTIME_NAME;
    2.24 +#else
    2.25 +     const char* loongson_runtime_name_and_version = "";
    2.26 +#endif
    2.27 +     st->print_cr("# JRE version: %s (%s) (build %s) (%s)", runtime_name, buf, runtime_version, loongson_runtime_name_and_version);
    2.28       st->print_cr("# Java VM: %s (%s %s %s %s)",
    2.29                     Abstract_VM_Version::vm_name(),
    2.30                     Abstract_VM_Version::vm_release(),