Mon, 11 May 2020 17:36:58 +0100
8233880: Support compilers with multi-digit major version numbers
Summary: Also includes JDK-8151841 version changes regressed by JDK-8034788
Reviewed-by: aph, andrew
common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
common/autoconf/toolchain.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Tue May 05 18:39:49 2020 +0100 1.2 +++ b/common/autoconf/generated-configure.sh Mon May 11 17:36:58 2020 +0100 1.3 @@ -4394,7 +4394,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=1587694859 1.8 +DATE_WHEN_GENERATED=1589212500 1.9 1.10 ############################################################################### 1.11 # 1.12 @@ -28000,7 +28000,7 @@ 1.13 COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ 1.14 $SED -e 's/ *Copyright .*//'` 1.15 COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ 1.16 - $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` 1.17 + $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` 1.18 elif test "x$TOOLCHAIN_TYPE" = xclang; then 1.19 # clang --version output typically looks like 1.20 # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) 1.21 @@ -29741,7 +29741,7 @@ 1.22 COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ 1.23 $SED -e 's/ *Copyright .*//'` 1.24 COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ 1.25 - $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` 1.26 + $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` 1.27 elif test "x$TOOLCHAIN_TYPE" = xclang; then 1.28 # clang --version output typically looks like 1.29 # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
2.1 --- a/common/autoconf/toolchain.m4 Tue May 05 18:39:49 2020 +0100 2.2 +++ b/common/autoconf/toolchain.m4 Mon May 11 17:36:58 2020 +0100 2.3 @@ -433,7 +433,7 @@ 2.4 COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ 2.5 $SED -e 's/ *Copyright .*//'` 2.6 COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ 2.7 - $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'` 2.8 + $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'` 2.9 elif test "x$TOOLCHAIN_TYPE" = xclang; then 2.10 # clang --version output typically looks like 2.11 # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)