From b29ed1829e32fffcea4b28f3a65393ce22ec1641 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 23 Sep 2020 17:56:47 -0400 Subject: [PATCH] update gcc futex time64 patch for compat with riscv32 riscv32 will define both syscalls but with equal value, and long will not be the right timespec member type. --- patches/gcc-5.3.0/0018-libstdc++-futex-time64.diff | 2 +- patches/gcc-6.5.0/0022-libstdc++-futex-time64.diff | 2 +- patches/gcc-7.3.0/0019-libstdc++-futex-time64.diff | 2 +- patches/gcc-8.3.0/0016-libstdc++-futex-time64.diff | 2 +- patches/gcc-9.2.0/0016-libstdc++-futex-time64.diff | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/gcc-5.3.0/0018-libstdc++-futex-time64.diff b/patches/gcc-5.3.0/0018-libstdc++-futex-time64.diff index 46902d1..08f6261 100644 --- a/patches/gcc-5.3.0/0018-libstdc++-futex-time64.diff +++ b/patches/gcc-5.3.0/0018-libstdc++-futex-time64.diff @@ -4,7 +4,7 @@ struct timeval tv; gettimeofday (&tv, NULL); // Convert the absolute timeout value to a relative timeout -+#if defined(SYS_futex_time64) ++#if defined(SYS_futex_time64) && SYS_futex_time64 != SYS_futex + struct + { + long tv_sec; diff --git a/patches/gcc-6.5.0/0022-libstdc++-futex-time64.diff b/patches/gcc-6.5.0/0022-libstdc++-futex-time64.diff index 46902d1..08f6261 100644 --- a/patches/gcc-6.5.0/0022-libstdc++-futex-time64.diff +++ b/patches/gcc-6.5.0/0022-libstdc++-futex-time64.diff @@ -4,7 +4,7 @@ struct timeval tv; gettimeofday (&tv, NULL); // Convert the absolute timeout value to a relative timeout -+#if defined(SYS_futex_time64) ++#if defined(SYS_futex_time64) && SYS_futex_time64 != SYS_futex + struct + { + long tv_sec; diff --git a/patches/gcc-7.3.0/0019-libstdc++-futex-time64.diff b/patches/gcc-7.3.0/0019-libstdc++-futex-time64.diff index 46902d1..08f6261 100644 --- a/patches/gcc-7.3.0/0019-libstdc++-futex-time64.diff +++ b/patches/gcc-7.3.0/0019-libstdc++-futex-time64.diff @@ -4,7 +4,7 @@ struct timeval tv; gettimeofday (&tv, NULL); // Convert the absolute timeout value to a relative timeout -+#if defined(SYS_futex_time64) ++#if defined(SYS_futex_time64) && SYS_futex_time64 != SYS_futex + struct + { + long tv_sec; diff --git a/patches/gcc-8.3.0/0016-libstdc++-futex-time64.diff b/patches/gcc-8.3.0/0016-libstdc++-futex-time64.diff index 46902d1..08f6261 100644 --- a/patches/gcc-8.3.0/0016-libstdc++-futex-time64.diff +++ b/patches/gcc-8.3.0/0016-libstdc++-futex-time64.diff @@ -4,7 +4,7 @@ struct timeval tv; gettimeofday (&tv, NULL); // Convert the absolute timeout value to a relative timeout -+#if defined(SYS_futex_time64) ++#if defined(SYS_futex_time64) && SYS_futex_time64 != SYS_futex + struct + { + long tv_sec; diff --git a/patches/gcc-9.2.0/0016-libstdc++-futex-time64.diff b/patches/gcc-9.2.0/0016-libstdc++-futex-time64.diff index 46902d1..08f6261 100644 --- a/patches/gcc-9.2.0/0016-libstdc++-futex-time64.diff +++ b/patches/gcc-9.2.0/0016-libstdc++-futex-time64.diff @@ -4,7 +4,7 @@ struct timeval tv; gettimeofday (&tv, NULL); // Convert the absolute timeout value to a relative timeout -+#if defined(SYS_futex_time64) ++#if defined(SYS_futex_time64) && SYS_futex_time64 != SYS_futex + struct + { + long tv_sec;