diff options
| author | rene <rene@FreeBSD.org> | 2018-11-02 21:40:24 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2018-11-02 21:40:24 +0800 |
| commit | e745ed32d7b6cef7c428075b64a75abb6cbd6de7 (patch) | |
| tree | 810984732ff2bcc7b406242348f683d67df254c2 /graphics/mesa-dri/files | |
| parent | abe85598b76e65884f63f5d35b14a7a5837c77ee (diff) | |
| download | freebsd-ports-gnome-e745ed32d7b6cef7c428075b64a75abb6cbd6de7.tar.gz freebsd-ports-gnome-e745ed32d7b6cef7c428075b64a75abb6cbd6de7.tar.zst freebsd-ports-gnome-e745ed32d7b6cef7c428075b64a75abb6cbd6de7.zip | |
Followup on r483807.
jbeich commented on some ports in D17724 but I forgot to add them to the list.
Submitted by: rene
Reviewed by: bapt, jbeich
Differential Revision: https://reviews.freebsd.org/D17724
Diffstat (limited to 'graphics/mesa-dri/files')
| -rw-r--r-- | graphics/mesa-dri/files/patch-src_util_futex.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/graphics/mesa-dri/files/patch-src_util_futex.h b/graphics/mesa-dri/files/patch-src_util_futex.h index fb45093b3f29..63503d6cac7d 100644 --- a/graphics/mesa-dri/files/patch-src_util_futex.h +++ b/graphics/mesa-dri/files/patch-src_util_futex.h @@ -1,16 +1,13 @@ - 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.orig 2018-09-24 16:00:57 UTC +++ src/util/futex.h -@@ -29,10 +29,35 @@ +@@ -29,10 +29,32 @@ #include <limits.h> #include <stdint.h> #include <unistd.h> +#if defined(__FreeBSD__) +#include <errno.h> -+# if __FreeBSD__ < 11 -+# include <machine/atomic.h> -+# endif +#include <sys/umtx.h> +#else #include <linux/futex.h> @@ -38,7 +35,7 @@ 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 +@@ -50,6 +72,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); } |