Thu, 31 Aug 2017 15:40:18 +0800
merge
1.1 --- a/.hgignore Wed Sep 17 11:23:18 2014 -0700 1.2 +++ b/.hgignore Thu Aug 31 15:40:18 2017 +0800 1.3 @@ -5,3 +5,4 @@ 1.4 ^.hgtip 1.5 ^.bridge2 1.6 .DS_Store 1.7 +cp.sh
2.1 --- a/common/autoconf/generated-configure.sh Wed Sep 17 11:23:18 2014 -0700 2.2 +++ b/common/autoconf/generated-configure.sh Thu Aug 31 15:40:18 2017 +0800 2.3 @@ -14,6 +14,12 @@ 2.4 ## M4sh Initialization. ## 2.5 ## -------------------- ## 2.6 2.7 +# 2.8 +# This file has been modified by Loongson Technology in 2015. These 2.9 +# modifications are Copyright (c) 2015 Loongson Technology, and are made 2.10 +# available on the same license terms set forth above. 2.11 +# 2.12 + 2.13 # Be more Bourne compatible 2.14 DUALCASE=1; export DUALCASE # for MKS sh 2.15 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : 2.16 @@ -6860,6 +6866,12 @@ 2.17 VAR_CPU_BITS=64 2.18 VAR_CPU_ENDIAN=big 2.19 ;; 2.20 + mips64el) 2.21 + VAR_CPU=mips64 2.22 + VAR_CPU_ARCH=mips 2.23 + VAR_CPU_BITS=64 2.24 + VAR_CPU_ENDIAN=little 2.25 + ;; 2.26 *) 2.27 as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5 2.28 ;; 2.29 @@ -6991,6 +7003,12 @@ 2.30 VAR_CPU_BITS=64 2.31 VAR_CPU_ENDIAN=big 2.32 ;; 2.33 + mips64el) 2.34 + VAR_CPU=mips64 2.35 + VAR_CPU_ARCH=mips 2.36 + VAR_CPU_BITS=64 2.37 + VAR_CPU_ENDIAN=little 2.38 + ;; 2.39 *) 2.40 as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5 2.41 ;; 2.42 @@ -7145,6 +7163,10 @@ 2.43 elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then 2.44 # On all platforms except macosx, we replace x86_64 with amd64. 2.45 OPENJDK_TARGET_CPU_OSARCH="amd64" 2.46 + elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64; then 2.47 + # 2013/11/13 Jin: to be exactly same with OpenJDK 6(mips64) 2.48 + # System.getProperty("os.arch"): mips64 -> mips64el 2.49 + OPENJDK_TARGET_CPU_OSARCH="mips64el" 2.50 fi 2.51 2.52
3.1 --- a/common/bin/hgforest.sh Wed Sep 17 11:23:18 2014 -0700 3.2 +++ b/common/bin/hgforest.sh Thu Aug 31 15:40:18 2017 +0800 3.3 @@ -23,6 +23,12 @@ 3.4 # questions. 3.5 # 3.6 3.7 +# 3.8 +# This file has been modified by Loongson Technology in 2013. These 3.9 +# modifications are Copyright (c) 2013 Loongson Technology, and are made 3.10 +# available on the same license terms set forth above. 3.11 +# 3.12 + 3.13 # Shell script for a fast parallel forest command 3.14 command="$1" 3.15 pull_extra_base="$2" 3.16 @@ -144,7 +150,9 @@ 3.17 ( 3.18 ( 3.19 if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then 3.20 - pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`" 3.21 + # 2013.2.27 Jin: fix the repo url for ssh 3.22 + #pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`" 3.23 + pull_newrepo=${pull_base}/$i 3.24 echo hg clone ${pull_newrepo} ${i} 3.25 path="`dirname ${i}`" 3.26 if [ "${path}" != "." ] ; then 3.27 @@ -158,13 +166,13 @@ 3.28 sleep 5 3.29 done 3.30 fi 3.31 - (PYTHONUNBUFFERED=true hg clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )& 3.32 + (PYTHONUNBUFFERED=true hg clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc ) 3.33 else 3.34 echo "cd ${i} && hg $*" 3.35 - cd ${i} && (PYTHONUNBUFFERED=true hg "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )& 3.36 + cd ${i} && (PYTHONUNBUFFERED=true hg "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc ) 3.37 fi 3.38 echo $! > ${tmp}/${repopidfile}.pid 3.39 - ) 2>&1 | sed -e "s@^@${reponame}: @") & 3.40 + ) 2>&1 | sed -e "s@^@${reponame}: @") 3.41 3.42 if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then 3.43 sleep 2