diff options
| author | tbell <none@none> | 2013-10-09 18:51:32 -0700 |
|---|---|---|
| committer | tbell <none@none> | 2013-10-09 18:51:32 -0700 |
| commit | 16d416f85262a8901cca0609e7c75becc531347b (patch) | |
| tree | 91ddfceac51bede4803ebdcb74c8b88abb89940a /common | |
| parent | 79aec9ca90410d4a6b668200cd87245c8904faa0 (diff) | |
8023611: Win32 and win64: Remove all the WARNINGS in JDK 8 builds for Windows 2008 and MSVS 2010 SP1
Reviewed-by: erikj
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoconf/generated-configure.sh | 6 | ||||
| -rw-r--r-- | common/autoconf/toolchain.m4 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index d099351..d14aa12 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3818,7 +3818,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1381162713 +DATE_WHEN_GENERATED=1381335331 ############################################################################### # @@ -19686,7 +19686,7 @@ $as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\ fi elif test "x$OPENJDK_TARGET_OS" = xwindows; then # First line typically looks something like: - # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 + # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` COMPILER_VENDOR="Microsoft CL.EXE" @@ -21258,7 +21258,7 @@ $as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\ fi elif test "x$OPENJDK_TARGET_OS" = xwindows; then # First line typically looks something like: - # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 + # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"` COMPILER_VENDOR="Microsoft CL.EXE" diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 index 2173300..f5e58f2 100644 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -46,7 +46,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSION], fi elif test "x$OPENJDK_TARGET_OS" = xwindows; then # First line typically looks something like: - # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 + # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86 COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"` COMPILER_VENDOR="Microsoft CL.EXE" |