From aff3d51fd973c5543983f2a9456cfd6e7703505d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Nov 2020 12:46:58 -0800 Subject: clang: Fix the __NR_futex_time64 patch Signed-off-by: Khem Raj --- ...efine-__NR_futex-to-be-__NR_futex_time64-on-.patch | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/recipes-devtools/clang/clang/0025-libcxx-Define-__NR_futex-to-be-__NR_futex_time64-on-.patch b/recipes-devtools/clang/clang/0025-libcxx-Define-__NR_futex-to-be-__NR_futex_time64-on-.patch index 0d57cc7..9097047 100644 --- a/recipes-devtools/clang/clang/0025-libcxx-Define-__NR_futex-to-be-__NR_futex_time64-on-.patch +++ b/recipes-devtools/clang/clang/0025-libcxx-Define-__NR_futex-to-be-__NR_futex_time64-on-.patch @@ -14,13 +14,11 @@ Signed-off-by: Khem Raj libcxx/src/atomic.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/libcxx/src/atomic.cpp b/libcxx/src/atomic.cpp -index 6b73ed771cd..d2511529dce 100644 --- a/libcxx/src/atomic.cpp +++ b/libcxx/src/atomic.cpp -@@ -15,6 +15,16 @@ - - #ifdef __linux__ +@@ -21,6 +21,16 @@ + #include + #include +// libc++ uses SYS_futex, which it expects from system C library. +// in glibc (/usr/include/bits/syscall.h defines it in terms of of NR_futex) @@ -29,12 +27,9 @@ index 6b73ed771cd..d2511529dce 100644 +// this aliases it to NR_futex so that SYS_futex is then defined for rv32 + +#if !defined(SYS_futex) && defined(SYS_futex_time64) -+# define SYS_futex SYS_futex_time64 ++#define SYS_futex SYS_futex_time64 +#endif + - #include - #include - #include --- -2.29.2 - + #else // <- Add other operating systems here + + // Baseline needs no new headers -- cgit v1.2.3-54-g00ecf