1.1 --- a/common/autoconf/toolchain.m4 Fri May 04 11:00:26 2018 +0100
1.2 +++ b/common/autoconf/toolchain.m4 Wed May 16 15:52:51 2018 -0700
1.3 @@ -808,8 +808,8 @@
1.4 CC_VERSION_OUTPUT=`$CC 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.5 COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"`
1.6 if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
1.7 - if test "x$COMPILER_CPU_TEST" != "x80x86"; then
1.8 - AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86".])
1.9 + if test "x$COMPILER_CPU_TEST" != "x80x86" -a "x$COMPILER_CPU_TEST" != "xx86"; then
1.10 + AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86" or "x86".])
1.11 fi
1.12 elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
1.13 if test "x$COMPILER_CPU_TEST" != "xx64"; then
