[patch] modified musl pthread patch

mesa-18-musl-pthread.patch (text/plain), 2.35 KB, created by Nicholas Fish on 2018-07-07 20:03:17 UTC

diff -Naur mesa-18.0.0-rc2.orig/src/gallium/state_trackers/nine/nine_debug.c mesa-18.0.0-rc2/src/gallium/state_trackers/nine/nine_debug.c
--- mesa-18.0.0-rc2.orig/src/gallium/state_trackers/nine/nine_debug.c	2018-01-24 13:20:13.287944874 -0800
+++ mesa-18.0.0-rc2/src/gallium/state_trackers/nine/nine_debug.c	2018-01-24 13:23:34.722941267 -0800
@@ -73,8 +73,8 @@
     }
 
 #if defined(HAVE_PTHREAD)
-#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
-      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
+#  if defined(__linux__) && !(defined(__GLIBC__) || \
+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
     if (dbg_flags & DBG_TID)
         tid = pthread_self();
 #  endif
diff -Naur mesa-18.0.0-rc2.orig/src/util/u_thread.h mesa-18.0.0-rc2/src/util/u_thread.h
--- mesa-18.0.0-rc2.orig/src/util/u_thread.h	2018-01-24 13:20:13.166944876 -0800
+++ mesa-18.0.0-rc2/src/util/u_thread.h	2018-01-24 13:24:11.028940616 -0800
@@ -61,9 +61,8 @@
 static inline void u_thread_setname( const char *name )
 {
 #if defined(HAVE_PTHREAD)
-#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
-      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \
-      defined(__linux__)
+#  if defined(__linux__) && !(defined(__GLIBC__) || \
+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
    pthread_setname_np(pthread_self(), name);
 #  endif
 #endif
@@ -93,8 +92,8 @@
 static inline bool u_thread_is_self(thrd_t thread)
 {
 #if defined(HAVE_PTHREAD)
-#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
-      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
+#  if defined(__linux__) && !(defined(__GLIBC__) || \
+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
    return pthread_equal(pthread_self(), thread);
 #  endif
 #endif
diff -u mesa-18.1.0/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h{.orig,}
--- mesa-18.1.0/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h.orig	2018-05-21 12:18:17.572276918 +0200
+++ mesa-18.1.0/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h	2018-05-21 12:18:27.223270274 +0200
@@ -28,6 +28,7 @@
 #ifndef RADV_AMDGPU_WINSYS_H
 #define RADV_AMDGPU_WINSYS_H
 
+#include <pthread.h>
 #include "radv_radeon_winsys.h"
 #include "ac_gpu_info.h"
 #include "addrlib/addrinterface.h"