|
@@ -0,0 +1,62 @@
|
|
|
+From 83068f9b71aea16d1ad036fdcc326de1027b5585 Mon Sep 17 00:00:00 2001
|
|
|
+From: Khem Raj <raj.khem@gmail.com>
|
|
|
+Date: Sun, 15 Nov 2020 22:13:29 -0800
|
|
|
+Subject: [PATCH] Use SYS_futex instead of __NR_futex
|
|
|
+
|
|
|
+SYS_futex is expected from system C library.
|
|
|
+in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex)
|
|
|
+rv32 is using 64bit time_t from get go unlike other 32bit architectures
|
|
|
+in glibc, therefore it wont have NR_futex defined but just NR_futex_time64
|
|
|
+this aliases it to NR_futex so that SYS_futex is then defined for rv32
|
|
|
+
|
|
|
+Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/670]
|
|
|
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
+---
|
|
|
+ linux/JackLinuxFutex.cpp | 10 +++++++---
|
|
|
+ 1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
+
|
|
|
+diff --git a/linux/JackLinuxFutex.cpp b/linux/JackLinuxFutex.cpp
|
|
|
+index deff006b..aef99cd2 100644
|
|
|
+--- a/linux/JackLinuxFutex.cpp
|
|
|
++++ b/linux/JackLinuxFutex.cpp
|
|
|
+@@ -29,6 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
+ #include <syscall.h>
|
|
|
+ #include <linux/futex.h>
|
|
|
+
|
|
|
++#if !defined(SYS_futex) && defined(SYS_futex_time64)
|
|
|
++#define SYS_futex SYS_futex_time64
|
|
|
++#endif
|
|
|
++
|
|
|
+ namespace Jack
|
|
|
+ {
|
|
|
+
|
|
|
+@@ -67,7 +71,7 @@ bool JackLinuxFutex::Signal()
|
|
|
+ if (! fFutex->internal) return true;
|
|
|
+ }
|
|
|
+
|
|
|
+- ::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
|
|
|
++ ::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1, NULL, NULL, 0);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+@@ -94,7 +98,7 @@ bool JackLinuxFutex::Wait()
|
|
|
+ if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
|
|
|
+ return true;
|
|
|
+
|
|
|
+- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
|
|
|
++ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, NULL, NULL, 0) != 0 && errno != EWOULDBLOCK)
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+@@ -122,7 +126,7 @@ bool JackLinuxFutex::TimedWait(long usec)
|
|
|
+ if (__sync_bool_compare_and_swap(&fFutex->futex, 1, 0))
|
|
|
+ return true;
|
|
|
+
|
|
|
+- if (::syscall(__NR_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
|
|
|
++ if (::syscall(SYS_futex, fFutex, fFutex->internal ? FUTEX_WAIT_PRIVATE : FUTEX_WAIT, 0, &timeout, NULL, 0) != 0 && errno != EWOULDBLOCK)
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+--
|
|
|
+2.29.2
|
|
|
+
|