diff options
| author | Richard Henderson <rth@redhat.com> | 2011-11-10 09:09:04 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2011-11-10 09:09:04 -0800 |
| commit | d4b179020b094a0106a96c288e545be220d4a742 (patch) | |
| tree | 07e6f7b8e7f2e100f0948704bfb12de29858cde2 /libitm/configure | |
| parent | 992b0aa1cfe185d5666b5627087a830ebb93df24 (diff) | |
| download | gcc-d4b179020b094a0106a96c288e545be220d4a742.zip gcc-d4b179020b094a0106a96c288e545be220d4a742.tar.gz gcc-d4b179020b094a0106a96c288e545be220d4a742.tar.bz2 | |
libitm: Don't add -mavx if the assembler doesn't support avx.
* config/x86/x86_avx.cc: Remove #undef __AVX__ hack. Tidy comments.
* Makefile.am (x86_avx.lo): Only add -mavx if ARCH_X86_AVX.
* configure.ac (ARCH_X86_AVX): New conditional.
* Makefile.in, configure: Rebuild.
From-SVN: r181261
Diffstat (limited to 'libitm/configure')
| -rw-r--r-- | libitm/configure | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libitm/configure b/libitm/configure index b30ced1..c0317cc 100644 --- a/libitm/configure +++ b/libitm/configure @@ -603,6 +603,8 @@ LTLIBOBJS LIBOBJS ARCH_FUTEX_FALSE ARCH_FUTEX_TRUE +ARCH_X86_AVX_FALSE +ARCH_X86_AVX_TRUE ARCH_X86_FALSE ARCH_X86_TRUE link_itm @@ -11714,7 +11716,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11717 "configure" +#line 11719 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11820,7 +11822,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11823 "configure" +#line 11825 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17265,6 +17267,14 @@ else ARCH_X86_FALSE= fi + if test "$libitm_cv_as_avx" = yes; then + ARCH_X86_AVX_TRUE= + ARCH_X86_AVX_FALSE='#' +else + ARCH_X86_AVX_TRUE='#' + ARCH_X86_AVX_FALSE= +fi + if test $enable_linux_futex = yes; then ARCH_FUTEX_TRUE= ARCH_FUTEX_FALSE='#' @@ -17418,6 +17428,10 @@ if test -z "${ARCH_X86_TRUE}" && test -z "${ARCH_X86_FALSE}"; then as_fn_error "conditional \"ARCH_X86\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ARCH_X86_AVX_TRUE}" && test -z "${ARCH_X86_AVX_FALSE}"; then + as_fn_error "conditional \"ARCH_X86_AVX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ARCH_FUTEX_TRUE}" && test -z "${ARCH_FUTEX_FALSE}"; then as_fn_error "conditional \"ARCH_FUTEX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 |