diff -r 9dc587b6adf9 -r e50b76885c16 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Wed May 30 13:15:53 2018 +0800 +++ b/common/autoconf/generated-configure.sh Tue Jul 24 13:19:47 2018 +0800 @@ -14,12 +14,6 @@ ## M4sh Initialization. ## ## -------------------- ## -# -# This file has been modified by Loongson Technology in 2015. These -# modifications are Copyright (c) 2015 Loongson Technology, and are made -# available on the same license terms set forth above. -# - # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : @@ -718,6 +712,9 @@ SHARED_LIBRARY OBJ_SUFFIX COMPILER_NAME +HOST_NAME +BUILDER_NAME +BUILDER_ID JT_HOME JTREGEXE ac_ct_OBJDUMP @@ -3707,6 +3704,12 @@ # questions. # +# +# This file has been modified by Loongson Technology in 2018. These +# modifications are Copyright (c) 2018 Loongson Technology, and are made +# available on the same license terms set forth above. +# + # Support macro for PLATFORM_EXTRACT_TARGET_AND_BUILD. # Converts autoconf style CPU name to OpenJDK style, into # VAR_CPU, VAR_CPU_ARCH, VAR_CPU_BITS and VAR_CPU_ENDIAN. @@ -3749,6 +3752,8 @@ + + # # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3918,7 +3923,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1521483882 +DATE_WHEN_GENERATED=1532409520 ############################################################################### # @@ -7220,8 +7225,8 @@ # On all platforms except macosx, we replace x86_64 with amd64. OPENJDK_TARGET_CPU_OSARCH="amd64" elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64; then - # 2013/11/13 Jin: to be exactly same with OpenJDK 6(mips64) - # System.getProperty("os.arch"): mips64 -> mips64el + # Jin: to be exactly same with OpenJDK 6(mips64) + # System.getProperty("os.arch"): mips64 -> mips64el OPENJDK_TARGET_CPU_OSARCH="mips64el" fi @@ -29363,6 +29368,40 @@ fi +BUILDER_NAME="$build_os" +BUILDER_ID="Custom build ($(date))" +if test -f /etc/issue; then + etc_issue_info=`cat /etc/issue` + if test -n "$etc_issue_info"; then + BUILDER_NAME=`cat /etc/issue | head -n 1 | cut -d " " -f 1` + fi +fi +if test -f /etc/neokylin-release; then + etc_issue_info=`cat /etc/neokylin-release` + if test -n "$etc_issue_info"; then + BUILDER_NAME=`cat /etc/neokylin-release | head -n 1 | cut -d " " -f 1` + fi +fi +if test -z "$BUILDER_NAME"; then + BUILDER_NAME="unknown" +fi +if test -n "$OPENJDK_TARGET_CPU_OSARCH"; then + HOST_NAME="$OPENJDK_TARGET_CPU_OSARCH" +else + HOST_NAME="unknown" +fi +if test -f "/usr/bin/cpp"; then + # gcc_with_arch_info=`gcc -v 2>&1 | grep '\-\-with-arch=' | sed 's/.*--with-arch=//;s/ .*$//'` + gcc_with_arch_info=`cpp -dM /dev/null | grep '\<_MIPS_ARCH\>' | sed 's/^#define _MIPS_ARCH "//;s/"$//'` + if test -n "$gcc_with_arch_info"; then + HOST_NAME="$gcc_with_arch_info" + fi +fi + + + + + # Configure flags for the tools