Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Fri Jun 28 11:55:46 2013 +0200
     1.2 +++ b/common/autoconf/generated-configure.sh	Fri Jun 28 11:58:16 2013 +0200
     1.3 @@ -3785,7 +3785,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1372317997
     1.8 +DATE_WHEN_GENERATED=1372413413
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -20133,7 +20133,7 @@
    1.13    elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
    1.14      # First line typically looks something like:
    1.15      # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
    1.16 -    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
    1.17 +    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
    1.18      COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
    1.19      COMPILER_VENDOR="Microsoft CL.EXE"
    1.20      COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
    1.21 @@ -21706,7 +21706,7 @@
    1.22    elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
    1.23      # First line typically looks something like:
    1.24      # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
    1.25 -    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
    1.26 +    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
    1.27      COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
    1.28      COMPILER_VENDOR="Microsoft CL.EXE"
    1.29      COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`

     2.1 --- a/common/autoconf/toolchain.m4	Fri Jun 28 11:55:46 2013 +0200
     2.2 +++ b/common/autoconf/toolchain.m4	Fri Jun 28 11:58:16 2013 +0200
     2.3 @@ -47,7 +47,7 @@
     2.4    elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
     2.5      # First line typically looks something like:
     2.6      # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
     2.7 -    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
     2.8 +    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
     2.9      COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"`
    2.10      COMPILER_VENDOR="Microsoft CL.EXE"
    2.11      COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`