From bb0452442a77570fce529cbb3d9fd99a94f3b50e Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Sun, 4 Jun 2017 12:53:01 +0800 Subject: [PATCH] Android: use bionic pthread_barrier_* if possible MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The pthread_barrier_* functions were introduced to bionic since Nougat. Signed-off-by: Chih-Wei Huang Acked-by: Tapani Pälli Acked-by: Emil Velikov --- Android.common.mk | 1 + src/gallium/auxiliary/os/os_thread.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Android.common.mk b/Android.common.mk index 57c31fc7e99..44ad97b6be2 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -44,6 +44,7 @@ LOCAL_CFLAGS += \ # It's likely due to a bug elsewhere, but let's temporarily add them # here to fix the radeonsi build. LOCAL_CFLAGS += \ + -DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \ -DENABLE_SHADER_CACHE \ -D__STDC_CONSTANT_MACROS \ -D__STDC_LIMIT_MACROS \ diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h index b6e0698da61..0a238e57493 100644 --- a/src/gallium/auxiliary/os/os_thread.h +++ b/src/gallium/auxiliary/os/os_thread.h @@ -75,7 +75,7 @@ __pipe_mutex_assert_locked(mtx_t *mutex) * pipe_barrier */ -#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) && !defined(PIPE_OS_ANDROID) +#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) && (!defined(PIPE_OS_ANDROID) || ANDROID_API_LEVEL >= 24) typedef pthread_barrier_t pipe_barrier; -- 2.11.0