From e96b03037ca455446fd7b5797c4e594ef38dbeb5 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 21 Jul 2017 16:44:14 +0100 Subject: swr: don't forget to link AVX/AVX2 against pthreads Seems like the backends have been using pthreads since day one, yet we've been missing the link. With later commit we'll fix a typo, hence the libraries will be build with -Wl,no-undefined, aka failing the build on unresolved symbols. v2: Split from a larger patch. Cc: mesa-stable@lists.freedesktop.org Cc: Bruce Cherniak Cc: Tim Rowley Cc: Laurent Carlier Fixes: c6e67f5a9373e916a8d2 "gallium/swr: add OpenSWR rasterizer" Reviewed-by: Eric Engestrom Signed-off-by: Emil Velikov (cherry picked from commit 33d397ada50a1d1f485205e847003dc48146ec19) [Emil Velikov: add PTHREAD_LIBS to COMMON_LIBADD] Signed-off-by: Emil Velikov Conflicts: src/gallium/drivers/swr/Makefile.am --- src/gallium/drivers/swr/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index 6650abda5ae..5e6dd54882c 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -158,7 +158,8 @@ rasterizer/core/gen_BackendPixelRate0.cpp: rasterizer/codegen/gen_backends.py ra COMMON_LIBADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/mesa/libmesagallium.la \ - $(LLVM_LIBS) + $(LLVM_LIBS) \ + $(PTHREAD_LIBS) COMMON_LDFLAGS = \ -shared \ @@ -172,6 +173,7 @@ COMMON_LDFLAGS = \ lib_LTLIBRARIES = libswrAVX.la libswrAVX2.la libswrAVX_la_CXXFLAGS = \ + $(PTHREAD_CFLAGS) \ $(SWR_AVX_CXXFLAGS) \ -DKNOB_ARCH=KNOB_ARCH_AVX \ $(COMMON_CXXFLAGS) @@ -186,6 +188,7 @@ libswrAVX_la_LDFLAGS = \ $(COMMON_LDFLAGS) libswrAVX2_la_CXXFLAGS = \ + $(PTHREAD_CFLAGS) \ $(SWR_AVX2_CXXFLAGS) \ -DKNOB_ARCH=KNOB_ARCH_AVX2 \ $(COMMON_CXXFLAGS) -- cgit v1.2.3