diff options
| author | Matt Turner <mattst88@gmail.com> | 2017-03-02 04:43:21 +0000 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2017-03-02 15:49:00 -0800 |
| commit | 7d1195c1e4d071fe796bf5f210c468ea1cc86225 (patch) | |
| tree | 9ccbf827536d6d256712c56ee8a513ffd34d880c | |
| parent | d7d64f1091006fb6faa48705c53f19ff5c657bc8 (diff) | |
clover: Work around build failure with AltiVec.
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=587210
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68504
Acked-by: Francisco Jerez <currojerez@riseup.net>
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | src/gallium/state_trackers/clover/Makefile.am | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index a3d1a00bdd0..57c4b1e0622 100644 --- a/configure.ac +++ b/configure.ac @@ -2033,6 +2033,20 @@ if test "x$enable_opencl" = xyes; then AC_MSG_ERROR([Clover requires libelf]) fi + if test "x${ac_cv_cxx_compiler_gnu}" = xyes; then + altivec_enabled=no + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #if !defined(__VEC__) || !defined(__ALTIVEC__) + #error "AltiVec not enabled" + #endif + ])], altivec_enabled=yes) + + if test "$altivec_enabled" = yes; then + CLOVER_STD_OVERRIDE="-std=gnu++11" + fi + AC_SUBST([CLOVER_STD_OVERRIDE]) + fi + llvm_require_version $LLVM_REQUIRED_OPENCL "opencl" llvm_add_default_components "opencl" diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am index a657e5b88af..321393536dc 100644 --- a/src/gallium/state_trackers/clover/Makefile.am +++ b/src/gallium/state_trackers/clover/Makefile.am @@ -32,6 +32,7 @@ noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la libcltgsi_la_CXXFLAGS = \ -std=c++11 \ + $(CLOVER_STD_OVERRIDE) \ $(VISIBILITY_CXXFLAGS) libcltgsi_la_SOURCES = $(TGSI_SOURCES) @@ -40,6 +41,7 @@ libclllvm_la_CXXFLAGS = \ -std=c++11 \ $(VISIBILITY_CXXFLAGS) \ $(LLVM_CXXFLAGS) \ + $(CLOVER_STD_OVERRIDE) \ $(DEFINES) \ $(LIBELF_CFLAGS) \ -DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \ @@ -50,6 +52,7 @@ libclllvm_la_SOURCES = $(LLVM_SOURCES) libclover_la_CXXFLAGS = \ -std=c++11 \ + $(CLOVER_STD_OVERRIDE) \ $(VISIBILITY_CXXFLAGS) libclover_la_LIBADD = \ |