# HG changeset patch
# User aoqi
# Date 1504165218 -28800
# Node ID 50aaf272884f3e1b6b9cbc4a2edfc99578f9ed89
# Parent  d117f01bfb4f34668ac216c9837e88acead14dce# Parent  2bcf2a10b799f0c14ba53f1f4a995514b1269884
merge

diff -r d117f01bfb4f -r 50aaf272884f .hgignore
--- a/.hgignore	Wed Sep 17 11:23:18 2014 -0700
+++ b/.hgignore	Thu Aug 31 15:40:18 2017 +0800
@@ -5,3 +5,4 @@
 ^.hgtip
 ^.bridge2
 .DS_Store
+cp.sh
diff -r d117f01bfb4f -r 50aaf272884f common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Wed Sep 17 11:23:18 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Thu Aug 31 15:40:18 2017 +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 :
@@ -6860,6 +6866,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
       ;;
@@ -6991,6 +7003,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
       ;;
@@ -7145,6 +7163,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 d117f01bfb4f -r 50aaf272884f common/bin/hgforest.sh
--- a/common/bin/hgforest.sh	Wed Sep 17 11:23:18 2014 -0700
+++ b/common/bin/hgforest.sh	Thu Aug 31 15:40:18 2017 +0800
@@ -23,6 +23,12 @@
 # questions.
 #
 
+#
+# This file has been modified by Loongson Technology in 2013. These
+# modifications are Copyright (c) 2013 Loongson Technology, and are made
+# available on the same license terms set forth above.
+#
+
 # Shell script for a fast parallel forest command
 command="$1"
 pull_extra_base="$2"
@@ -144,7 +150,9 @@
   (
     (
       if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
-        pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`"
+        # 2013.2.27 Jin: fix the repo url for ssh
+        #pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`"
+        pull_newrepo=${pull_base}/$i
         echo hg clone ${pull_newrepo} ${i}
         path="`dirname ${i}`"
         if [ "${path}" != "." ] ; then
@@ -158,13 +166,13 @@
             sleep 5
           done
         fi
-        (PYTHONUNBUFFERED=true hg clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
+        (PYTHONUNBUFFERED=true hg clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )
       else
         echo "cd ${i} && hg $*"
-        cd ${i} && (PYTHONUNBUFFERED=true hg "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )&
+        cd ${i} && (PYTHONUNBUFFERED=true hg "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )
       fi
       echo $! > ${tmp}/${repopidfile}.pid
-    ) 2>&1 | sed -e "s@^@${reponame}:   @") &
+    ) 2>&1 | sed -e "s@^@${reponame}:   @") 
 
   if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then
     sleep 2