merge mips64el-jdk8u40-b33

Thu, 12 Oct 2017 19:39:08 +0800

author
aoqi
date
Thu, 12 Oct 2017 19:39:08 +0800
changeset 1288
7801df19942d
parent 1287
8b3c10f939d7
parent 1134
8386163b96f7
child 1289
8082c366bd63

merge

.hgtags file | annotate | diff | comparison | revisions
Makefile file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
common/autoconf/boot-jdk.m4 file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
common/autoconf/spec.gmk.in file | annotate | diff | comparison | revisions
common/bin/hgforest.sh file | annotate | diff | comparison | revisions
get_source.sh file | annotate | diff | comparison | revisions
make/Javadoc.gmk file | annotate | diff | comparison | revisions
make/Jprt.gmk file | annotate | diff | comparison | revisions
make/Main.gmk file | annotate | diff | comparison | revisions
make/MakeHelpers.gmk file | annotate | diff | comparison | revisions
make/common/NON_CORE_PKGS.gmk file | annotate | diff | comparison | revisions
make/jprt.properties file | annotate | diff | comparison | revisions
test/Makefile file | annotate | diff | comparison | revisions
     1.1 --- a/.hgignore	Mon Mar 16 11:48:56 2015 -0700
     1.2 +++ b/.hgignore	Thu Oct 12 19:39:08 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/.hgtags	Mon Mar 16 11:48:56 2015 -0700
     2.2 +++ b/.hgtags	Thu Oct 12 19:39:08 2017 +0800
     2.3 @@ -333,6 +333,7 @@
     2.4  4429ea47ee6eca6b8a1dbda1950566ee821ba19d jdk8u25-b14
     2.5  09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
     2.6  f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
     2.7 +50aaf272884f3e1b6b9cbc4a2edfc99578f9ed89 mips64el-jdk8u25-b17
     2.8  d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
     2.9  efac90a2da447c2b2d43ee1b1e20c0828659f9c5 jdk8u25-b18
    2.10  1a0b4ec68abc4e9248ca6041fff04612674a9b9f jdk8u25-b31
     3.1 --- a/common/autoconf/generated-configure.sh	Mon Mar 16 11:48:56 2015 -0700
     3.2 +++ b/common/autoconf/generated-configure.sh	Thu Oct 12 19:39:08 2017 +0800
     3.3 @@ -14,6 +14,12 @@
     3.4  ## M4sh Initialization. ##
     3.5  ## -------------------- ##
     3.6  
     3.7 +#
     3.8 +# This file has been modified by Loongson Technology in 2015. These
     3.9 +# modifications are Copyright (c) 2015 Loongson Technology, and are made
    3.10 +# available on the same license terms set forth above.
    3.11 +#
    3.12 +
    3.13  # Be more Bourne compatible
    3.14  DUALCASE=1; export DUALCASE # for MKS sh
    3.15  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
    3.16 @@ -6864,6 +6870,12 @@
    3.17        VAR_CPU_BITS=64
    3.18        VAR_CPU_ENDIAN=big
    3.19        ;;
    3.20 +    mips64el)
    3.21 +      VAR_CPU=mips64
    3.22 +      VAR_CPU_ARCH=mips
    3.23 +      VAR_CPU_BITS=64
    3.24 +      VAR_CPU_ENDIAN=little
    3.25 +      ;;
    3.26      *)
    3.27        as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
    3.28        ;;
    3.29 @@ -6995,6 +7007,12 @@
    3.30        VAR_CPU_BITS=64
    3.31        VAR_CPU_ENDIAN=big
    3.32        ;;
    3.33 +    mips64el)
    3.34 +      VAR_CPU=mips64
    3.35 +      VAR_CPU_ARCH=mips
    3.36 +      VAR_CPU_BITS=64
    3.37 +      VAR_CPU_ENDIAN=little
    3.38 +      ;;
    3.39      *)
    3.40        as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
    3.41        ;;
    3.42 @@ -7149,6 +7167,10 @@
    3.43    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
    3.44      # On all platforms except macosx, we replace x86_64 with amd64.
    3.45      OPENJDK_TARGET_CPU_OSARCH="amd64"
    3.46 +  elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64; then
    3.47 +    # 2013/11/13 Jin: to be exactly same with OpenJDK 6(mips64)
    3.48 +    #   System.getProperty("os.arch"): mips64 -> mips64el
    3.49 +    OPENJDK_TARGET_CPU_OSARCH="mips64el"
    3.50    fi
    3.51  
    3.52  

mercurial