# HG changeset patch
# User aoqi
# Date 1527596913 -28800
# Node ID 5907c486e70f40bf5594af682969cea30773c758
# Parent  4d038b84d11353246e218d8f8dcd04637e09ee6d# Parent  a17b97ca9aead90c53ab0dfa3bf06bc53616c1f0
Merge

diff -r 4d038b84d113 -r 5907c486e70f .hgtags
--- a/.hgtags	Wed Mar 28 08:34:11 2018 -0700
+++ b/.hgtags	Tue May 29 20:28:33 2018 +0800
@@ -333,6 +333,7 @@
 4429ea47ee6eca6b8a1dbda1950566ee821ba19d jdk8u25-b14
 09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
 f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
+50aaf272884f3e1b6b9cbc4a2edfc99578f9ed89 mips64el-jdk8u25-b17
 d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
 efac90a2da447c2b2d43ee1b1e20c0828659f9c5 jdk8u25-b18
 1a0b4ec68abc4e9248ca6041fff04612674a9b9f jdk8u25-b31
@@ -386,6 +387,7 @@
 12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27
 eee2ebbb97f136cd458d4f3a825ee40d0046f425 jdk8u40-b31
 b92f3d486e47d29dfb1ea2096db295077328368e jdk8u40-b32
+7801df19942d7cbeccbf578bf2917e8c44e6a8a2 mips64el-jdk8u40-b33
 8b3c10f939d77adacf2a3ff7510de66bd024cfe4 jdk8u40-b33
 ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
 635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01
@@ -460,6 +462,8 @@
 d3bdbc19827e1a97e046b65e39cb9c7255d4603b jdk8u60-b26
 d50c3672fd185a4ca074c43d261edfcb1df7bc54 jdk8u60-b27
 cdc5223800ccf9607e19740d41429dacca03c623 jdk8u60-b31
+8fb42903851382845d0ca9e5cd404b921bc60c8b mips64el-jdk8u60-b32
+e4fa3872e8daf17623b90a41ee5bef2d985e07b4 mips64el-jdk8u60-b33
 d7f8f147ff1d78987a4d963b2eda1477804cccec jdk8u60-b32
 45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06
 2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07
@@ -664,6 +668,7 @@
 c7043839334d65f6cefd0f7d54705cbb61e40377 jdk8u112-b13
 b4441c5520688b42c52caa36861744429ec4385a jdk8u112-b14
 bfb88850a367a747e77f4cb164a12ea54ec8e8da jdk8u112-b15
+8b05886031859232201c1c7da69c375add48f192 mips64el-jdk8u112-b17
 14388b14d4847c3eacce677eae37980e6fa545cd jdk8u112-b16
 1a7a5fe22a028e438a724d909d27da2ea96c6d86 jdk8u112-b31
 911c506096560e49442a4c8f598f7f43c2339720 jdk8u112-b32
@@ -770,6 +775,8 @@
 ec86194825dd0c2fc3d6ee88b287650e1c8e24c9 jdk8u152-b13
 c425fe56b8fb34e21a798be796305f51d648f11b jdk8u152-b14
 d680e12deacbc531fe647d356540384efe625223 jdk8u152-b15
+2224002fc647f7488cec33d9564b4f8b624f0cd0 mips64el-jdk8u152-b17
+77767b5809f7436f0cc5c1a382ff01669d02565d mips64el-jdk8u152-b18
 7a25d12cd94fa7a881f064dcb35f0e88ed073c45 jdk8u152-b16
 2093adf5331251080398d5a2f0f2cf58cffcb0a1 jdk8u152-b31
 54a2665aef21b20d7e436bd615a3e722649accb1 jdk8u152-b32
@@ -819,6 +826,8 @@
 0601c290e21e7dbd4cac57595b7deb3302e59cb9 jdk8u162-b09
 9c40d1fac7fced8f769efc7ed3014ab77ba65e36 jdk8u162-b10
 3b37f1a6ba6b98a8aa9b0b43e96b374a22a21b99 jdk8u162-b11
+d2665bc3ac3a645c6f8e61b699bc64b1f110aff7 mips64el-jdk8u162-b13
+9f1ca8851ac82dfd81a43a329e6289a0023a833d mips64el-jdk8u162-b14
 173b2b978c05e59aa471e82be9013955ebd6b4de jdk8u162-b12
 a127ef57877d806f0840ccd6e7a2be337692fe6e jdk8u162-b31
 d66f57333c7fcc735f87eb0903ffdc0aaf899b32 jdk8u171-b00
diff -r 4d038b84d113 -r 5907c486e70f common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Wed Mar 28 08:34:11 2018 -0700
+++ b/common/autoconf/generated-configure.sh	Tue May 29 20:28:33 2018 +0800
@@ -14,6 +14,12 @@
 ## M4sh Initialization. ##
 ## -------------------- ##
 
+#
+# This file has been modified by Loongson Technology in 2015. These
+# modifications are Copyright (c) 2015 Loongson Technology, and are made
+# available on the same license terms set forth above.
+#
+
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
@@ -6910,6 +6916,12 @@
       VAR_CPU_BITS=64
       VAR_CPU_ENDIAN=big
       ;;
+    mips64el)
+      VAR_CPU=mips64
+      VAR_CPU_ARCH=mips
+      VAR_CPU_BITS=64
+      VAR_CPU_ENDIAN=little
+      ;;
     *)
       as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
       ;;
@@ -7047,6 +7059,12 @@
       VAR_CPU_BITS=64
       VAR_CPU_ENDIAN=big
       ;;
+    mips64el)
+      VAR_CPU=mips64
+      VAR_CPU_ARCH=mips
+      VAR_CPU_BITS=64
+      VAR_CPU_ENDIAN=little
+      ;;
     *)
       as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
       ;;
@@ -7201,6 +7219,10 @@
   elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     # On all platforms except macosx, we replace x86_64 with amd64.
     OPENJDK_TARGET_CPU_OSARCH="amd64"
+  elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64; then
+    # 2013/11/13 Jin: to be exactly same with OpenJDK 6(mips64)
+    #   System.getProperty("os.arch"): mips64 -> mips64el
+    OPENJDK_TARGET_CPU_OSARCH="mips64el"
   fi
 
 
diff -r 4d038b84d113 -r 5907c486e70f support/CLASSPATH_EXCEPTION_NOTE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/support/CLASSPATH_EXCEPTION_NOTE	Tue May 29 20:28:33 2018 +0800
@@ -0,0 +1,3 @@
+A “Classpath Exception File” means any source file contained in this distribution which contains the following words in such file’s header: “Oracle designates this particular file as subject to the "Classpath" exception as provided by Oracle in the LICENSE file that accompanied this code.”
+
+Loongson Technology hereby confirms that each Classpath Exception File is subject to the clarification and special exception to the GPL that is outlined in the accompanying LICENSE file (under the heading “‘CLASSPATH’ EXCEPTION TO THE GPL”).