OSDN Git Service

util: Link libmesautil into u_atomic_test
authorMatt Turner <mattst88@gmail.com>
Thu, 14 Sep 2017 17:48:57 +0000 (10:48 -0700)
committerJuan A. Suarez Romero <jasuarez@igalia.com>
Wed, 20 Sep 2017 20:54:11 +0000 (22:54 +0200)
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

src/util/Makefile.am

index b92dbac..d17b402 100644 (file)
@@ -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