diff options
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch b/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch index d2d6d76fd7..c5fac9b040 100644 --- a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch +++ b/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch @@ -1,33 +1,33 @@ -From 77c95dacffe90382a1f131c801ac569120d95949 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 8 Jan 2016 07:32:24 +0000 -Subject: [PATCH 30/32] lib: Use PTHREAD_MUTEX_RECURSIVE in place of +From 00ba7cdd0608b1507027428f9f87b1cb9747372b Mon Sep 17 00:00:00 2001 +From: Dengke Du <dengke.du@windriver.com> +Date: Thu, 9 Feb 2017 15:54:53 +0800 +Subject: [PATCH] lib: Use PTHREAD_MUTEX_RECURSIVE in place of PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP for non-glibc e.g. musl does not implement the _NP mutex types Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Dengke Du <dengke.du@windriver.com> --- - lib/tst_res.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + lib/tst_res.c | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/lib/tst_res.c b/lib/tst_res.c -index 5c1c58c..3244b5e 100644 +index 61daaeb..435224f 100644 --- a/lib/tst_res.c +++ b/lib/tst_res.c -@@ -104,8 +104,11 @@ int TEST_ERRNO; +@@ -79,7 +79,11 @@ int TEST_ERRNO; assert(strlen(buf) > 0); \ } while (0) +#ifdef __GLIBC__ static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; -- +#else +static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE }; +#endif - /* - * Define local function prototypes. - */ + + static void check_env(void); + static void tst_condense(int tnum, int ttype, const char *tmesg); -- -2.7.0 +2.7.4 |