1.1 --- a/common/autoconf/generated-configure.sh Sat Dec 15 09:57:00 2018 -0800
1.2 +++ b/common/autoconf/generated-configure.sh Thu Apr 04 17:59:06 2019 +0800
1.3 @@ -711,6 +711,9 @@
1.4 SHARED_LIBRARY_FLAGS
1.5 CXX_FLAG_REORDER
1.6 C_FLAG_REORDER
1.7 +HOST_NAME
1.8 +BUILDER_NAME
1.9 +BUILDER_ID
1.10 SYSROOT_LDFLAGS
1.11 SYSROOT_CFLAGS
1.12 RC_FLAGS
1.13 @@ -4013,6 +4016,12 @@
1.14 # questions.
1.15 #
1.16
1.17 +#
1.18 +# This file has been modified by Loongson Technology in 2018. These
1.19 +# modifications are Copyright (c) 2018 Loongson Technology, and are made
1.20 +# available on the same license terms set forth above.
1.21 +#
1.22 +
1.23 # Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD.
1.24 # Converts autoconf style CPU name to OpenJDK style, into
1.25 # VAR_CPU, VAR_CPU_ARCH, VAR_CPU_BITS and VAR_CPU_ENDIAN.
1.26 @@ -4055,6 +4064,8 @@
1.27
1.28
1.29
1.30 +
1.31 +
1.32 #
1.33 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.34 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.35 @@ -4342,7 +4353,7 @@
1.36 #CUSTOM_AUTOCONF_INCLUDE
1.37
1.38 # Do not change or remove the following line, it is needed for consistency checks:
1.39 -DATE_WHEN_GENERATED=1544009140
1.40 +DATE_WHEN_GENERATED=1554371898
1.41
1.42 ###############################################################################
1.43 #
1.44 @@ -13646,6 +13657,12 @@
1.45 VAR_CPU_BITS=64
1.46 VAR_CPU_ENDIAN=big
1.47 ;;
1.48 + mips64el)
1.49 + VAR_CPU=mips64
1.50 + VAR_CPU_ARCH=mips
1.51 + VAR_CPU_BITS=64
1.52 + VAR_CPU_ENDIAN=little
1.53 + ;;
1.54 *)
1.55 as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
1.56 ;;
1.57 @@ -13784,6 +13801,12 @@
1.58 VAR_CPU_BITS=64
1.59 VAR_CPU_ENDIAN=big
1.60 ;;
1.61 + mips64el)
1.62 + VAR_CPU=mips64
1.63 + VAR_CPU_ARCH=mips
1.64 + VAR_CPU_BITS=64
1.65 + VAR_CPU_ENDIAN=little
1.66 + ;;
1.67 *)
1.68 as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
1.69 ;;
1.70 @@ -13906,6 +13929,8 @@
1.71 OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
1.72 elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.73 OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
1.74 + elif test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
1.75 + OPENJDK_TARGET_CPU_LEGACY_LIB="mips64el"
1.76 fi
1.77
1.78
1.79 @@ -13939,6 +13964,10 @@
1.80 elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.81 # On all platforms except macosx, we replace x86_64 with amd64.
1.82 OPENJDK_TARGET_CPU_OSARCH="amd64"
1.83 + elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
1.84 + # Jin: to be exactly same with OpenJDK 6(mips64)
1.85 + # System.getProperty("os.arch"): mips64 -> mips64el
1.86 + OPENJDK_TARGET_CPU_OSARCH="mips64el"
1.87 fi
1.88
1.89
1.90 @@ -13948,6 +13977,8 @@
1.91 elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
1.92 # On all platforms except macosx, we replace x86_64 with amd64.
1.93 OPENJDK_TARGET_CPU_JLI="amd64"
1.94 + elif test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
1.95 + OPENJDK_TARGET_CPU_JLI="mips64el"
1.96 fi
1.97 # Now setup the -D flags for building libjli.
1.98 OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
1.99 @@ -13958,6 +13989,9 @@
1.100 OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
1.101 fi
1.102 fi
1.103 + if test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
1.104 + OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"mips32el\"' -DLIBARCH64NAME='\"mips64el\"'"
1.105 + fi
1.106
1.107
1.108 # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
1.109 @@ -41127,6 +41161,46 @@
1.110 fi
1.111
1.112
1.113 +BUILDER_NAME="$build_os"
1.114 +BUILDER_ID="Custom build ($(date))"
1.115 +if test -f /etc/issue; then
1.116 + etc_issue_info=`cat /etc/issue`
1.117 + if test -n "$etc_issue_info"; then
1.118 + BUILDER_NAME=`cat /etc/issue | head -n 1 | cut -d " " -f 1`
1.119 + fi
1.120 +fi
1.121 +if test -f /etc/redhat-release; then
1.122 + etc_issue_info=`cat /etc/redhat-release`
1.123 + if test -n "$etc_issue_info"; then
1.124 + BUILDER_NAME=`cat /etc/redhat-release | head -n 1 | cut -d " " -f 1`
1.125 + fi
1.126 +fi
1.127 +if test -f /etc/neokylin-release; then
1.128 + etc_issue_info=`cat /etc/neokylin-release`
1.129 + if test -n "$etc_issue_info"; then
1.130 + BUILDER_NAME=`cat /etc/neokylin-release | head -n 1 | cut -d " " -f 1`
1.131 + fi
1.132 +fi
1.133 +if test -z "$BUILDER_NAME"; then
1.134 + BUILDER_NAME="unknown"
1.135 +fi
1.136 +if test -n "$OPENJDK_TARGET_CPU_OSARCH"; then
1.137 + HOST_NAME="$OPENJDK_TARGET_CPU_OSARCH"
1.138 +else
1.139 + HOST_NAME="unknown"
1.140 +fi
1.141 +if test -f "/usr/bin/cpp"; then
1.142 + # gcc_with_arch_info=`gcc -v 2>&1 | grep '\-\-with-arch=' | sed 's/.*--with-arch=//;s/ .*$//'`
1.143 + gcc_with_arch_info=`cpp -dM /dev/null | grep '\<_MIPS_ARCH\>' | sed 's/^#define _MIPS_ARCH "//;s/"$//'`
1.144 + if test -n "$gcc_with_arch_info"; then
1.145 + HOST_NAME="$gcc_with_arch_info"
1.146 + fi
1.147 +fi
1.148 +
1.149 +
1.150 +
1.151 +
1.152 +
1.153 # Configure flags for the tools
1.154
1.155 ###############################################################################
