Merge mips64el-jdk8u192-b13

Thu, 27 Dec 2018 11:47:57 +0800

author
aoqi
date
Thu, 27 Dec 2018 11:47:57 +0800
changeset 2316
64a3eeabf6e5
parent 2315
4d3fefdd2f98
parent 2189
d581672c9eb3
child 2317
87fdec2cf8ed

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
common/autoconf/Makefile.in file | annotate | diff | comparison | revisions
common/autoconf/autogen.sh file | annotate | diff | comparison | revisions
common/autoconf/basics.m4 file | annotate | diff | comparison | revisions
common/autoconf/basics_windows.m4 file | annotate | diff | comparison | revisions
common/autoconf/boot-jdk.m4 file | annotate | diff | comparison | revisions
common/autoconf/build-performance.m4 file | annotate | diff | comparison | revisions
common/autoconf/compare.sh.in file | annotate | diff | comparison | revisions
common/autoconf/configure file | annotate | diff | comparison | revisions
common/autoconf/configure.ac file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/help.m4 file | annotate | diff | comparison | revisions
common/autoconf/hotspot-spec.gmk.in file | annotate | diff | comparison | revisions
common/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
common/autoconf/libraries.m4 file | annotate | diff | comparison | revisions
common/autoconf/platform.m4 file | annotate | diff | comparison | revisions
common/autoconf/spec.gmk.in file | annotate | diff | comparison | revisions
common/autoconf/toolchain.m4 file | annotate | diff | comparison | revisions
common/autoconf/toolchain_windows.m4 file | annotate | diff | comparison | revisions
common/bin/compare.sh file | annotate | diff | comparison | revisions
make/Main.gmk file | annotate | diff | comparison | revisions
make/common/MakeBase.gmk file | annotate | diff | comparison | revisions
make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions
make/devkit/Makefile file | annotate | diff | comparison | revisions
make/devkit/Tools.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Sat Oct 06 10:24:47 2018 +0100
     1.2 +++ b/.hgtags	Thu Dec 27 11:47:57 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  911c506096560e49442a4c8f598f7f43c2339720 jdk8u112-b32
    1.36 @@ -770,6 +775,8 @@
    1.37  ec86194825dd0c2fc3d6ee88b287650e1c8e24c9 jdk8u152-b13
    1.38  c425fe56b8fb34e21a798be796305f51d648f11b jdk8u152-b14
    1.39  d680e12deacbc531fe647d356540384efe625223 jdk8u152-b15
    1.40 +2224002fc647f7488cec33d9564b4f8b624f0cd0 mips64el-jdk8u152-b17
    1.41 +77767b5809f7436f0cc5c1a382ff01669d02565d mips64el-jdk8u152-b18
    1.42  7a25d12cd94fa7a881f064dcb35f0e88ed073c45 jdk8u152-b16
    1.43  2093adf5331251080398d5a2f0f2cf58cffcb0a1 jdk8u152-b31
    1.44  54a2665aef21b20d7e436bd615a3e722649accb1 jdk8u152-b32
    1.45 @@ -819,6 +826,8 @@
    1.46  0601c290e21e7dbd4cac57595b7deb3302e59cb9 jdk8u162-b09
    1.47  9c40d1fac7fced8f769efc7ed3014ab77ba65e36 jdk8u162-b10
    1.48  3b37f1a6ba6b98a8aa9b0b43e96b374a22a21b99 jdk8u162-b11
    1.49 +d2665bc3ac3a645c6f8e61b699bc64b1f110aff7 mips64el-jdk8u162-b13
    1.50 +9f1ca8851ac82dfd81a43a329e6289a0023a833d mips64el-jdk8u162-b14
    1.51  173b2b978c05e59aa471e82be9013955ebd6b4de jdk8u162-b12
    1.52  a127ef57877d806f0840ccd6e7a2be337692fe6e jdk8u162-b31
    1.53  2c309abde14fbef07fe07304f493f770da0f5564 jdk8u162-b32
    1.54 @@ -854,6 +863,8 @@
    1.55  20086fb0be29b3e82a3841d3c1829f1437976f27 jdk8u172-b08
    1.56  9361e8414bf1b1bbba36ecf4b81687ae254c1e63 jdk8u172-b09
    1.57  ff9f47b14b8a0302a90ad9a4d793073205de52e2 jdk8u172-b10
    1.58 +5907c486e70f40bf5594af682969cea30773c758 mips64el-jdk8u172-b12
    1.59 +0c54636b64a444920ce653f81b9b39d2a781dff5 mips64el-jdk8u172-b13
    1.60  4d038b84d11353246e218d8f8dcd04637e09ee6d jdk8u172-b11
    1.61  031aebc4b792ba53dbc384f68bca53c839e8c397 jdk8u181-b01
    1.62  a0101c7abbb958c25082a6781e54ce7799178b3e jdk8u181-b02
    1.63 @@ -878,6 +889,8 @@
    1.64  e19e26e852d6250739f4ce4de92d4a5bcdd56926 jdk8u181-b11
    1.65  760af13b89232fe5387667f3848be95cfead953e jdk8u181-b12
    1.66  ead7f893fb2c4a919820497f39a51fa640f4753e jdk8u181-b13
    1.67 +5c86538f0b0d0b8b6b578235826dc0d440209162 mips64el-jdk8u181-b14
    1.68 +d75ef5fa5b02a053df2a096d6c8e2af81a2b4d32 mips64el-jdk8u181-b15
    1.69  c87c3a9a789e8bad94fb39bc3c2c7c4a532f7330 jdk8u191-b01
    1.70  d6007fa4ffae140f4c4ad551a1ee290a0704a094 jdk8u191-b02
    1.71  99395ddbb670d9621c9755afa330c579a57dfd9b jdk8u191-b03
     2.1 --- a/common/autoconf/build-aux/config.guess	Sat Oct 06 10:24:47 2018 +0100
     2.2 +++ b/common/autoconf/build-aux/config.guess	Thu Dec 27 11:47:57 2018 +0800
     2.3 @@ -86,4 +86,15 @@
     2.4    fi
     2.5  fi
     2.6  
     2.7 +# Test and fix little endian MIPS.
     2.8 +if [ "x$OUT" = x ]; then
     2.9 +  if [ `uname -s` = Linux ]; then
    2.10 +    if [ `uname -m` = mipsel ]; then
    2.11 +      OUT=mipsel-unknown-linux-gnu
    2.12 +    elif [ `uname -m` = mips64el ]; then
    2.13 +      OUT=mips64el-unknown-linux-gnu
    2.14 +    fi
    2.15 +  fi
    2.16 +fi
    2.17 +
    2.18  echo $OUT
     3.1 --- a/common/autoconf/configure.ac	Sat Oct 06 10:24:47 2018 +0100
     3.2 +++ b/common/autoconf/configure.ac	Thu Dec 27 11:47:57 2018 +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 2018. These
     3.9 +# modifications are Copyright (c) 2018 Loongson Technology, and are made
    3.10 +# available on the same license terms set forth above.
    3.11 +#
    3.12 +
    3.13  ###############################################################################
    3.14  #
    3.15  # Includes and boilerplate
    3.16 @@ -186,6 +192,7 @@
    3.17  # Now we can test some aspects on the target using configure macros.
    3.18  PLATFORM_SETUP_OPENJDK_TARGET_BITS
    3.19  PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS
    3.20 +GET_BUILDER_AND_HOST_DATA
    3.21  
    3.22  # Configure flags for the tools
    3.23  FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS
     4.1 --- a/common/autoconf/generated-configure.sh	Sat Oct 06 10:24:47 2018 +0100
     4.2 +++ b/common/autoconf/generated-configure.sh	Thu Dec 27 11:47:57 2018 +0800
     4.3 @@ -709,6 +709,9 @@
     4.4  SHARED_LIBRARY_FLAGS
     4.5  CXX_FLAG_REORDER
     4.6  C_FLAG_REORDER
     4.7 +HOST_NAME
     4.8 +BUILDER_NAME
     4.9 +BUILDER_ID
    4.10  SYSROOT_LDFLAGS
    4.11  SYSROOT_CFLAGS
    4.12  RC_FLAGS
    4.13 @@ -4008,6 +4011,12 @@
    4.14  # questions.
    4.15  #
    4.16  
    4.17 +#
    4.18 +# This file has been modified by Loongson Technology in 2018. These
    4.19 +# modifications are Copyright (c) 2018 Loongson Technology, and are made
    4.20 +# available on the same license terms set forth above.
    4.21 +#
    4.22 +
    4.23  # Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
    4.24  # Converts autoconf style CPU name to OpenJDK style, into
    4.25  # VAR_CPU, VAR_CPU_ARCH, VAR_CPU_BITS and VAR_CPU_ENDIAN.
    4.26 @@ -4050,6 +4059,8 @@
    4.27  
    4.28  
    4.29  
    4.30 +
    4.31 +
    4.32  #
    4.33  # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    4.34  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    4.35 @@ -4336,7 +4347,7 @@
    4.36  #CUSTOM_AUTOCONF_INCLUDE
    4.37  
    4.38  # Do not change or remove the following line, it is needed for consistency checks:
    4.39 -DATE_WHEN_GENERATED=1536764960
    4.40 +DATE_WHEN_GENERATED=1545882409
    4.41  
    4.42  ###############################################################################
    4.43  #
    4.44 @@ -13640,6 +13651,12 @@
    4.45        VAR_CPU_BITS=64
    4.46        VAR_CPU_ENDIAN=big
    4.47        ;;
    4.48 +    mips64el)
    4.49 +      VAR_CPU=mips64
    4.50 +      VAR_CPU_ARCH=mips
    4.51 +      VAR_CPU_BITS=64
    4.52 +      VAR_CPU_ENDIAN=little
    4.53 +      ;;
    4.54      *)
    4.55        as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
    4.56        ;;
    4.57 @@ -13778,6 +13795,12 @@
    4.58        VAR_CPU_BITS=64
    4.59        VAR_CPU_ENDIAN=big
    4.60        ;;
    4.61 +    mips64el)
    4.62 +      VAR_CPU=mips64
    4.63 +      VAR_CPU_ARCH=mips
    4.64 +      VAR_CPU_BITS=64
    4.65 +      VAR_CPU_ENDIAN=little
    4.66 +      ;;
    4.67      *)
    4.68        as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
    4.69        ;;
    4.70 @@ -13900,6 +13923,8 @@
    4.71      OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
    4.72    elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
    4.73      OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
    4.74 +  elif test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
    4.75 +    OPENJDK_TARGET_CPU_LEGACY_LIB="mips64el"
    4.76    fi
    4.77  
    4.78  
    4.79 @@ -13933,6 +13958,10 @@
    4.80    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
    4.81      # On all platforms except macosx, we replace x86_64 with amd64.
    4.82      OPENJDK_TARGET_CPU_OSARCH="amd64"
    4.83 +  elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
    4.84 +    # Jin: to be exactly same with OpenJDK 6(mips64)
    4.85 +    # System.getProperty("os.arch"): mips64 -> mips64el
    4.86 +    OPENJDK_TARGET_CPU_OSARCH="mips64el"
    4.87    fi
    4.88  
    4.89  
    4.90 @@ -13942,6 +13971,8 @@
    4.91    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
    4.92      # On all platforms except macosx, we replace x86_64 with amd64.
    4.93      OPENJDK_TARGET_CPU_JLI="amd64"
    4.94 +  elif test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
    4.95 +    OPENJDK_TARGET_CPU_JLI="mips64el"
    4.96    fi
    4.97    # Now setup the -D flags for building libjli.
    4.98    OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
    4.99 @@ -13952,6 +13983,9 @@
   4.100        OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
   4.101      fi
   4.102    fi
   4.103 +  if test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
   4.104 +    OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"mips32el\"' -DLIBARCH64NAME='\"mips64el\"'"
   4.105 +  fi
   4.106  
   4.107  
   4.108    # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
   4.109 @@ -41110,6 +41144,46 @@
   4.110    fi
   4.111  
   4.112  
   4.113 +BUILDER_NAME="$build_os"
   4.114 +BUILDER_ID="Custom build ($(date))"
   4.115 +if test -f /etc/issue; then
   4.116 +  etc_issue_info=`cat /etc/issue`
   4.117 +  if test -n "$etc_issue_info"; then
   4.118 +    BUILDER_NAME=`cat /etc/issue | head -n 1 | cut -d " " -f 1`
   4.119 +  fi
   4.120 +fi
   4.121 +if test -f /etc/redhat-release; then
   4.122 +  etc_issue_info=`cat /etc/redhat-release`
   4.123 +  if test -n "$etc_issue_info"; then
   4.124 +    BUILDER_NAME=`cat /etc/redhat-release | head -n 1 | cut -d " " -f 1`
   4.125 +  fi
   4.126 +fi
   4.127 +if test -f /etc/neokylin-release; then
   4.128 +  etc_issue_info=`cat /etc/neokylin-release`
   4.129 +  if test -n "$etc_issue_info"; then
   4.130 +    BUILDER_NAME=`cat /etc/neokylin-release | head -n 1 | cut -d " " -f 1`
   4.131 +  fi
   4.132 +fi
   4.133 +if test -z "$BUILDER_NAME"; then
   4.134 +  BUILDER_NAME="unknown"
   4.135 +fi
   4.136 +if test -n "$OPENJDK_TARGET_CPU_OSARCH"; then
   4.137 +  HOST_NAME="$OPENJDK_TARGET_CPU_OSARCH"
   4.138 +else
   4.139 +  HOST_NAME="unknown"
   4.140 +fi
   4.141 +if test -f "/usr/bin/cpp"; then
   4.142 +  # gcc_with_arch_info=`gcc -v 2>&1 | grep '\-\-with-arch=' | sed 's/.*--with-arch=//;s/ .*$//'`
   4.143 +  gcc_with_arch_info=`cpp -dM /dev/null | grep '\<_MIPS_ARCH\>' | sed 's/^#define _MIPS_ARCH "//;s/"$//'`
   4.144 +  if test -n "$gcc_with_arch_info"; then
   4.145 +    HOST_NAME="$gcc_with_arch_info"
   4.146 +  fi
   4.147 +fi
   4.148 +
   4.149 +
   4.150 +
   4.151 +
   4.152 +
   4.153  # Configure flags for the tools
   4.154  
   4.155    ###############################################################################
     5.1 --- a/common/autoconf/platform.m4	Sat Oct 06 10:24:47 2018 +0100
     5.2 +++ b/common/autoconf/platform.m4	Thu Dec 27 11:47:57 2018 +0800
     5.3 @@ -23,6 +23,12 @@
     5.4  # questions.
     5.5  #
     5.6  
     5.7 +#
     5.8 +# This file has been modified by Loongson Technology in 2018. These
     5.9 +# modifications are Copyright (c) 2018 Loongson Technology, and are made
    5.10 +# available on the same license terms set forth above.
    5.11 +#
    5.12 +
    5.13  # Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
    5.14  # Converts autoconf style CPU name to OpenJDK style, into
    5.15  # VAR_CPU, VAR_CPU_ARCH, VAR_CPU_BITS and VAR_CPU_ENDIAN.
    5.16 @@ -96,6 +102,12 @@
    5.17        VAR_CPU_BITS=64
    5.18        VAR_CPU_ENDIAN=big
    5.19        ;;
    5.20 +    mips64el)
    5.21 +      VAR_CPU=mips64
    5.22 +      VAR_CPU_ARCH=mips
    5.23 +      VAR_CPU_BITS=64
    5.24 +      VAR_CPU_ENDIAN=little
    5.25 +      ;;
    5.26      *)
    5.27        AC_MSG_ERROR([unsupported cpu $1])
    5.28        ;;
    5.29 @@ -283,6 +295,8 @@
    5.30      OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
    5.31    elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
    5.32      OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
    5.33 +  elif test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
    5.34 +    OPENJDK_TARGET_CPU_LEGACY_LIB="mips64el"
    5.35    fi
    5.36    AC_SUBST(OPENJDK_TARGET_CPU_LEGACY_LIB)
    5.37  
    5.38 @@ -316,6 +330,10 @@
    5.39    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
    5.40      # On all platforms except macosx, we replace x86_64 with amd64.
    5.41      OPENJDK_TARGET_CPU_OSARCH="amd64"
    5.42 +  elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
    5.43 +    # Jin: to be exactly same with OpenJDK 6(mips64)
    5.44 +    # System.getProperty("os.arch"): mips64 -> mips64el
    5.45 +    OPENJDK_TARGET_CPU_OSARCH="mips64el"
    5.46    fi
    5.47    AC_SUBST(OPENJDK_TARGET_CPU_OSARCH)
    5.48  
    5.49 @@ -325,6 +343,8 @@
    5.50    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
    5.51      # On all platforms except macosx, we replace x86_64 with amd64.
    5.52      OPENJDK_TARGET_CPU_JLI="amd64"
    5.53 +  elif test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
    5.54 +    OPENJDK_TARGET_CPU_JLI="mips64el"
    5.55    fi
    5.56    # Now setup the -D flags for building libjli.
    5.57    OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
    5.58 @@ -335,6 +355,9 @@
    5.59        OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
    5.60      fi
    5.61    fi
    5.62 +  if test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
    5.63 +    OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"mips32el\"' -DLIBARCH64NAME='\"mips64el\"'"
    5.64 +  fi
    5.65    AC_SUBST(OPENJDK_TARGET_CPU_JLI_CFLAGS)
    5.66  
    5.67    # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
    5.68 @@ -548,3 +571,45 @@
    5.69      AC_MSG_ERROR([The tested endian in the target ($ENDIAN) differs from the endian expected to be found in the target ($OPENJDK_TARGET_CPU_ENDIAN)])
    5.70    fi
    5.71  ])
    5.72 +
    5.73 +AC_DEFUN([GET_BUILDER_AND_HOST_DATA],
    5.74 +[
    5.75 +BUILDER_NAME="$build_os"
    5.76 +BUILDER_ID="Custom build ($(date))"
    5.77 +if test -f /etc/issue; then
    5.78 +  etc_issue_info=`cat /etc/issue`
    5.79 +  if test -n "$etc_issue_info"; then
    5.80 +    BUILDER_NAME=`cat /etc/issue | head -n 1 | cut -d " " -f 1`
    5.81 +  fi
    5.82 +fi
    5.83 +if test -f /etc/redhat-release; then
    5.84 +  etc_issue_info=`cat /etc/redhat-release`
    5.85 +  if test -n "$etc_issue_info"; then
    5.86 +    BUILDER_NAME=`cat /etc/redhat-release | head -n 1 | cut -d " " -f 1`
    5.87 +  fi
    5.88 +fi
    5.89 +if test -f /etc/neokylin-release; then
    5.90 +  etc_issue_info=`cat /etc/neokylin-release`
    5.91 +  if test -n "$etc_issue_info"; then
    5.92 +    BUILDER_NAME=`cat /etc/neokylin-release | head -n 1 | cut -d " " -f 1`
    5.93 +  fi
    5.94 +fi
    5.95 +if test -z "$BUILDER_NAME"; then
    5.96 +  BUILDER_NAME="unknown"
    5.97 +fi
    5.98 +if test -n "$OPENJDK_TARGET_CPU_OSARCH"; then
    5.99 +  HOST_NAME="$OPENJDK_TARGET_CPU_OSARCH"
   5.100 +else
   5.101 +  HOST_NAME="unknown"
   5.102 +fi
   5.103 +if test -f "/usr/bin/cpp"; then
   5.104 +  # gcc_with_arch_info=`gcc -v 2>&1 | grep '\-\-with-arch=' | sed 's/.*--with-arch=//;s/ .*$//'`
   5.105 +  gcc_with_arch_info=`cpp -dM /dev/null | grep '\<_MIPS_ARCH\>' | sed 's/^#define _MIPS_ARCH "//;s/"$//'`
   5.106 +  if test -n "$gcc_with_arch_info"; then
   5.107 +    HOST_NAME="$gcc_with_arch_info"
   5.108 +  fi
   5.109 +fi
   5.110 +AC_SUBST(BUILDER_ID)
   5.111 +AC_SUBST(BUILDER_NAME)
   5.112 +AC_SUBST(HOST_NAME)
   5.113 +])
     6.1 --- a/common/autoconf/spec.gmk.in	Sat Oct 06 10:24:47 2018 +0100
     6.2 +++ b/common/autoconf/spec.gmk.in	Thu Dec 27 11:47:57 2018 +0800
     6.3 @@ -23,6 +23,12 @@
     6.4  # questions.
     6.5  #
     6.6  
     6.7 +#
     6.8 +# This file has been modified by Loongson Technology in 2018. These
     6.9 +# modifications are Copyright (c) 2018 Loongson Technology, and are made
    6.10 +# available on the same license terms set forth above.
    6.11 +#
    6.12 +
    6.13  # Configured @DATE_WHEN_CONFIGURED@ to build
    6.14  # for target system @OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU@
    6.15  #   (called @OPENJDK_TARGET_AUTOCONF_NAME@ by autoconf)
    6.16 @@ -189,6 +195,23 @@
    6.17  endif
    6.18  JRE_RELEASE_VERSION:=$(FULL_VERSION)
    6.19  
    6.20 +# Build OS and host values for use in Loongson OpenJDK release
    6.21 +BUILDER_ID:=@BUILDER_ID@
    6.22 +BUILDER_NAME:=@BUILDER_NAME@
    6.23 +HOST_NAME:=@HOST_NAME@
    6.24 +
    6.25 +# Loongson OpenJDK Version info
    6.26 +VER=8.1
    6.27 +ifeq ($(HOST_NAME), )
    6.28 +  HOST_NAME=unknown
    6.29 +endif
    6.30 +ifeq ($(BUILDER_NAME), )
    6.31 +  BUILDER_NAME=unknown
    6.32 +endif
    6.33 +HOST_NAME_STRING=-$(HOST_NAME)
    6.34 +BUILDER_NAME_STRING=-$(BUILDER_NAME)
    6.35 +LOONGSON_RUNTIME_NAME=Loongson $(VER)$(HOST_NAME_STRING)$(BUILDER_NAME_STRING)
    6.36 +
    6.37  # How to compile the code: release, fastdebug or slowdebug
    6.38  DEBUG_LEVEL:=@DEBUG_LEVEL@
    6.39  
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/support/CLASSPATH_EXCEPTION_NOTE	Thu Dec 27 11:47:57 2018 +0800
     7.3 @@ -0,0 +1,3 @@
     7.4 +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.”
     7.5 +
     7.6 +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”).

mercurial