From 5596d26a5c2df26fc591c8dad0e2bc87ee2f88e2 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Fri, 26 May 2017 17:16:35 +0000 Subject: [PATCH] re PR fortran/80889 (Bootstrap broken on all targets due to rev 248472) 2017-05-26 Thomas Koenig PR boostrap/80889 * acinclude.m4: Also set HAVE_AVX128 on the false branch of LIBGFOR_CHECK_AVX128. * configure: Regenerated. From-SVN: r248519 --- libgfortran/ChangeLog | 7 +++++++ libgfortran/acinclude.m4 | 2 +- libgfortran/configure | 13 +++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 3e6c0ad2a61..720b1ce2265 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2017-05-26 Thomas Koenig + + PR boostrap/80889 + * acinclude.m4: Also set HAVE_AVX128 on the false + branch of LIBGFOR_CHECK_AVX128. + * configure: Regenerated. + 2017-05-25 Thomas Koenig PR libfortran/78379 diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4 index cd8dfabffe9..b501a5e4ef9 100644 --- a/libgfortran/acinclude.m4 +++ b/libgfortran/acinclude.m4 @@ -499,6 +499,6 @@ AC_DEFUN([LIBGFOR_CHECK_AVX128], [ AC_DEFINE(HAVE_AVX128, 1, [Define if -mprefer-avx128 is supported.]) AM_CONDITIONAL([HAVE_AVX128],true), - []) + [AM_CONDITIONAL([HAVE_AVX128],false)]) CFLAGS="$ac_save_CFLAGS" ]) diff --git a/libgfortran/configure b/libgfortran/configure index 36e015594ba..28f10d57474 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -26453,6 +26453,15 @@ else HAVE_AVX128_FALSE= fi +else + if false; then + HAVE_AVX128_TRUE= + HAVE_AVX128_FALSE='#' +else + HAVE_AVX128_TRUE='#' + HAVE_AVX128_FALSE= +fi + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" @@ -26714,6 +26723,10 @@ if test -z "${HAVE_AVX128_TRUE}" && test -z "${HAVE_AVX128_FALSE}"; then as_fn_error "conditional \"HAVE_AVX128\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_AVX128_TRUE}" && test -z "${HAVE_AVX128_FALSE}"; then + as_fn_error "conditional \"HAVE_AVX128\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 -- 2.30.2