Attachment #538732 for bug #660648

View | Details | Raw Unified | Return to bug 660648
Collapse All | Expand All

Lines 73-80 Link Here

(-)mesa-18.0.0-rc2.orig/src/gallium/state_trackers/nine/nine_debug.c (-2 / +2 lines)
73	}	73	}
74		74
75	#if defined(HAVE_PTHREAD)	75	#if defined(HAVE_PTHREAD)
76	# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \	76	# if defined(__linux__) && !(defined(__GLIBC__) \|\| \
77	(__GLIBC__ >= 3 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))	77	(__GLIBC__ < 3 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
78	if (dbg_flags & DBG_TID)	78	if (dbg_flags & DBG_TID)
79	tid = pthread_self();	79	tid = pthread_self();
80	# endif	80	# endif




static inline void u_thread_setname( const char *name )
{
#if defined(HAVE_PTHREAD)
#  if defined(__linux__) && !(defined(__GLIBC__) || \
      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
      defined(__linux__)
   pthread_setname_np(pthread_self(), name);
#  endif
#endif

static inline bool u_thread_is_self(thrd_t thread)
{
#if defined(HAVE_PTHREAD)
#  if defined(__linux__) && !(defined(__GLIBC__) || \
      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
   return pthread_equal(pthread_self(), thread);
#  endif
#endif

Lines 28-33 Link Here

(-)mesa-18.1.0/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h.orig (+1 lines)
28	#ifndef RADV_AMDGPU_WINSYS_H	28	#ifndef RADV_AMDGPU_WINSYS_H
29	#define RADV_AMDGPU_WINSYS_H	29	#define RADV_AMDGPU_WINSYS_H
30		30
		31	#include <pthread.h>
31	#include "radv_radeon_winsys.h"	32	#include "radv_radeon_winsys.h"
32	#include "ac_gpu_info.h"	33	#include "ac_gpu_info.h"
33	#include "addrlib/addrinterface.h"	34	#include "addrlib/addrinterface.h"

Return to bug 660648

Lines 61-69 Link Here

(-)mesa-18.0.0-rc2.orig/src/util/u_thread.h (-5 / +4 lines)
61	static inline void u_thread_setname( const char *name )	61	static inline void u_thread_setname( const char *name )
62	{	62	{
63	#if defined(HAVE_PTHREAD)	63	#if defined(HAVE_PTHREAD)
64	# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \	64	# if defined(__linux__) && !(defined(__GLIBC__) \|\| \
65	(__GLIBC__ >= 3 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \	65	(__GLIBC__ < 3 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
66	defined(__linux__)
67	pthread_setname_np(pthread_self(), name);	66	pthread_setname_np(pthread_self(), name);
68	# endif	67	# endif
69	#endif	68	#endif
Lines 93-100 Link Here
93	static inline bool u_thread_is_self(thrd_t thread)	92	static inline bool u_thread_is_self(thrd_t thread)
94	{	93	{
95	#if defined(HAVE_PTHREAD)	94	#if defined(HAVE_PTHREAD)
96	# if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \	95	# if defined(__linux__) && !(defined(__GLIBC__) \|\| \
97	(__GLIBC__ >= 3 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))	96	(__GLIBC__ < 3 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
98	return pthread_equal(pthread_self(), thread);	97	return pthread_equal(pthread_self(), thread);
99	# endif	98	# endif
100	#endif	99	#endif