Merge mips64el-jdk8u152-b17

Thu, 24 May 2018 18:05:17 +0800

author
aoqi
date
Thu, 24 May 2018 18:05:17 +0800
changeset 2003
2224002fc647
parent 2002
7a25d12cd94f
parent 1860
121868e1dea2
child 2004
5829d4de7956

Merge

.hgignore file | annotate | diff | comparison | revisions
.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/hotspot-spec.gmk.in file | annotate | diff | comparison | revisions
common/autoconf/spec.gmk.in file | annotate | diff | comparison | revisions
common/autoconf/toolchain.m4 file | annotate | diff | comparison | revisions
make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Sep 06 00:34:55 2017 -0700
     1.2 +++ b/.hgtags	Thu May 24 18:05:17 2018 +0800
     1.3 @@ -333,6 +333,7 @@
     1.4  4429ea47ee6eca6b8a1dbda1950566ee821ba19d jdk8u25-b14
     1.5  09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
     1.6  f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
     1.7 +50aaf272884f3e1b6b9cbc4a2edfc99578f9ed89 mips64el-jdk8u25-b17
     1.8  d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
     1.9  efac90a2da447c2b2d43ee1b1e20c0828659f9c5 jdk8u25-b18
    1.10  1a0b4ec68abc4e9248ca6041fff04612674a9b9f jdk8u25-b31
    1.11 @@ -386,6 +387,7 @@
    1.12  12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27
    1.13  eee2ebbb97f136cd458d4f3a825ee40d0046f425 jdk8u40-b31
    1.14  b92f3d486e47d29dfb1ea2096db295077328368e jdk8u40-b32
    1.15 +7801df19942d7cbeccbf578bf2917e8c44e6a8a2 mips64el-jdk8u40-b33
    1.16  8b3c10f939d77adacf2a3ff7510de66bd024cfe4 jdk8u40-b33
    1.17  ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
    1.18  635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01
    1.19 @@ -460,6 +462,8 @@
    1.20  d3bdbc19827e1a97e046b65e39cb9c7255d4603b jdk8u60-b26
    1.21  d50c3672fd185a4ca074c43d261edfcb1df7bc54 jdk8u60-b27
    1.22  cdc5223800ccf9607e19740d41429dacca03c623 jdk8u60-b31
    1.23 +8fb42903851382845d0ca9e5cd404b921bc60c8b mips64el-jdk8u60-b32
    1.24 +e4fa3872e8daf17623b90a41ee5bef2d985e07b4 mips64el-jdk8u60-b33
    1.25  d7f8f147ff1d78987a4d963b2eda1477804cccec jdk8u60-b32
    1.26  45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06
    1.27  2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07
    1.28 @@ -664,6 +668,7 @@
    1.29  c7043839334d65f6cefd0f7d54705cbb61e40377 jdk8u112-b13
    1.30  b4441c5520688b42c52caa36861744429ec4385a jdk8u112-b14
    1.31  bfb88850a367a747e77f4cb164a12ea54ec8e8da jdk8u112-b15
    1.32 +8b05886031859232201c1c7da69c375add48f192 mips64el-jdk8u112-b17
    1.33  14388b14d4847c3eacce677eae37980e6fa545cd jdk8u112-b16
    1.34  1a7a5fe22a028e438a724d909d27da2ea96c6d86 jdk8u112-b31
    1.35  58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u121-b00
     2.1 --- a/common/autoconf/generated-configure.sh	Wed Sep 06 00:34:55 2017 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Thu May 24 18:05:17 2018 +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 @@ -6910,6 +6916,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 @@ -7047,6 +7059,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 @@ -7201,6 +7219,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  

mercurial