summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2017-09-14 10:48:57 -0700
committerJuan A. Suarez Romero <jasuarez@igalia.com>2017-09-20 22:54:11 +0200
commitb55385ac60cbdeaac67dbfa35f5ff7138bf4d086 (patch)
treeaf3a84d736113533d40487f2ac61fb5d4c3e9e90
parentd6a5e80e8a0ebe299629f2e64a1c744a2c4a9054 (diff)
util: Link libmesautil into u_atomic_test
Platforms without particular atomic operations require the implementations in u_atomic.c Cc: "17.2" <mesa-stable@lists.freedesktop.org> Fixes: a6a38a038bd ("util/u_atomic: provide 64bit atomics where they're missing") Reviewed-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit d075a4089ec62c489c8a3423f82371bf85f2ea6c) [Juan A. Suarez: resolve trivial conflicts] Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com> Conflicts: src/util/Makefile.am
-rw-r--r--src/util/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index b92dbac7fff..d17b402413d 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -48,6 +48,7 @@ libmesautil_la_LIBADD = \
$(CLOCK_LIB) \
$(ZLIB_LIBS)
+u_atomic_test_LDADD = libmesautil.la
roundeven_test_LDADD = -lm
check_PROGRAMS = u_atomic_test roundeven_test