@@ -894,7 +894,7 @@ case "$host_os" in

 darwin*)

     ;;

 *)

-    AC_CHECK_FUNCS([clock_gettime], [CLOCK_LIB=],

+    AC_CHECK_FUNCS([clock_gettime clock_nanosleep], [CLOCK_LIB=],

                    [AC_CHECK_LIB([rt], [clock_gettime], [CLOCK_LIB=-lrt],

                                  [AC_MSG_ERROR([Could not find clock_gettime])])])

     AC_SUBST([CLOCK_LIB])

@@ -942,7 +942,10 @@ if test "x$pthread_stubs_possible" = xyes; then

 fi

 dnl Check for futex for fast inline simple_mtx_t.

-AC_CHECK_HEADER([linux/futex.h], [DEFINES="$DEFINES -DHAVE_LINUX_FUTEX_H"])

+AC_CHECK_HEADERS([linux/futex.h sys/umtx.h],

+    [DEFINES="$DEFINES -DHAVE_LINUX_FUTEX_H"],,

+    [#include <errno.h>

+     #include <sys/types.h>])

 dnl SELinux awareness.

 AC_ARG_ENABLE([selinux],

@@ -21895,12 +21895,13 @@ case "$host_os" in

 darwin*)

     ;;

 *)

-    for ac_func in clock_gettime

+    for ac_func in clock_gettime clock_nanosleep

 do :

-  ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"

-if test "x$ac_cv_func_clock_gettime" = xyes; then :

+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :

   cat >>confdefs.h <<_ACEOF

-#define HAVE_CLOCK_GETTIME 1

+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

 _ACEOF

  CLOCK_LIB=

 else

@@ -22559,11 +22559,20 @@ $as_echo "yes" >&6; }

 fi

 fi

-ac_fn_c_check_header_mongrel "$LINENO" "linux/futex.h" "ac_cv_header_linux_futex_h" "$ac_includes_default"

-if test "x$ac_cv_header_linux_futex_h" = xyes; then :

-  DEFINES="$DEFINES -DHAVE_LINUX_FUTEX_H"

+for ac_header in linux/futex.h sys/umtx.h

+do :

+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <errno.h>

+     #include <sys/types.h>

+"

+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :

+  cat >>confdefs.h <<_ACEOF

+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

+_ACEOF

+ DEFINES="$DEFINES -DHAVE_LINUX_FUTEX_H"

 fi

+done

 # Check whether --enable-selinux was given.

- Define ETIME if missing

--- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c.orig	2018-01-23 18:08:49 UTC

+++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c

@@ -33,6 +33,9 @@

 #include "radv_amdgpu_bo.h"

 #include "sid.h"

+#ifndef ETIME

+#define ETIME ETIMEDOUT

+#endif

 enum {

 	VIRTUAL_BUFFER_HASH_TABLE_SIZE = 1024

 #  include <ws2tcpip.h>

compiler/brw_fs_bank_conflicts.cpp:719:25: error: scalar initializer cannot be empty

      vector_type s_p = {}, s_n = {};

                        ^~

compiler/brw_fs_bank_conflicts.cpp:719:35: error: scalar initializer cannot be empty

      vector_type s_p = {}, s_n = {};

                                  ^~

--- src/intel/compiler/brw_fs_bank_conflicts.cpp.orig	2018-01-23 18:08:50 UTC

+++ src/intel/compiler/brw_fs_bank_conflicts.cpp

@@ -716,7 +716,7 @@ namespace {

                    const weight_vector_type &conflicts)

    {

       const unsigned m = DIV_ROUND_UP(conflicts.size, vector_width);

-      vector_type s_p = {}, s_n = {};

+      vector_type s_p = {0}, s_n = {0};

       for (unsigned r = 0; r < m; r++) {

          s_p = adds(s_p, mask(bank_mask_p.v[r], conflicts.v[r]));

 #include <sys/mman.h>

- Implement futex_wake() and futex_wait() via _umtx_op()

--- src/util/futex.h.orig	2018-01-23 18:08:50 UTC

+++ src/util/futex.h

@@ -29,10 +29,35 @@

 #include <limits.h>

 #include <stdint.h>

 #include <unistd.h>

+#if defined(__FreeBSD__)

+# if __FreeBSD__ < 11

+#  include <machine/atomic.h>

+# endif

+#include <errno.h>

+#include <sys/umtx.h>

+#else

 #include <linux/futex.h>

 #include <sys/syscall.h>

+#endif

 #include <sys/time.h>

+#if defined(__FreeBSD__)

+static inline int futex_wake(uint32_t *addr, int count)

+{

+   return _umtx_op(addr, UMTX_OP_WAKE, (uint32_t)count, NULL, NULL) == -1 ? errno : 0;

+}

+

+static inline int futex_wait(uint32_t *addr, int32_t value, struct timespec *timeout)

+{

+   void *uaddr = NULL, *uaddr2 = NULL;

+   if (timeout != NULL) {

+      const struct _umtx_time tmo = { ._clockid = CLOCK_MONOTONIC, ._flags = UMTX_ABSTIME, ._timeout = *timeout };

+      uaddr = (void *)(uintptr_t)sizeof(tmo);

+      uaddr2 = (void *)&tmo;

+   }

+   return _umtx_op(addr, UMTX_OP_WAIT_UINT, (uint32_t)value, uaddr, uaddr2) == -1 ? errno : 0;

+}

+#else

 static inline long sys_futex(void *addr1, int op, int val1, const struct timespec *timeout, void *addr2, int val3)

 {

    return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);

@@ -50,6 +75,7 @@ static inline int futex_wait(uint32_t *addr, int32_t v

    return sys_futex(addr, FUTEX_WAIT_BITSET, value, timeout, NULL,

                     FUTEX_BITSET_MATCH_ANY);

 }

+#endif

 #endif

- Use monotonic clock for timeouts

--- src/util/os_time.c.orig	2018-01-23 18:08:50 UTC

+++ src/util/os_time.c

@@ -55,7 +55,7 @@

 int64_t

 os_time_get_nano(void)

 {

-#if defined(PIPE_OS_LINUX)

+#if defined(PIPE_OS_BSD) || defined(PIPE_OS_LINUX)

    struct timespec tv;

    clock_gettime(CLOCK_MONOTONIC, &tv);

@@ -95,7 +95,7 @@ os_time_get_nano(void)

 void

 os_time_sleep(int64_t usecs)

 {

-#if defined(PIPE_OS_LINUX)

+#if defined(HAVE_CLOCK_NANOSLEEP)

    struct timespec time;

    time.tv_sec = usecs / 1000000;

    time.tv_nsec = (usecs % 1000000) * 1000;

- Implement setting thread name

- Use monotonic clock for timeouts

--- src/util/u_thread.h.orig	2018-02-09 02:18:00 UTC

+++ src/util/u_thread.h

@@ -34,7 +34,11 @@

 #ifdef HAVE_PTHREAD

 #include <signal.h>

+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)

+#include <pthread_np.h>

+#undef ALIGN /* Avoid conflict on FreeBSD in main/macros.h */

 #endif

+#endif

 static inline thrd_t u_thread_create(int (*routine)(void *), void *param)

@@ -65,6 +69,12 @@ static inline void u_thread_setname( const char *name 

       (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \

       defined(__linux__)

    pthread_setname_np(pthread_self(), name);

+#  elif defined(__sun)

+   pthread_setname_np(pthread_self(), name);

+#  elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)

+   pthread_set_name_np(pthread_self(), name);

+#  elif defined(__NetBSD__)

+   pthread_setname_np(pthread_self(), "%s", (void*)name);

 #  endif

 #endif

    (void)name;

@@ -78,7 +88,7 @@ static inline void u_thread_setname( const char *name 

 static inline int64_t

 u_thread_get_time_nano(thrd_t thread)

 {

-#if defined(__linux__) && defined(HAVE_PTHREAD)

+#if defined(HAVE_PTHREAD)

    struct timespec ts;

    clockid_t cid;