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.
richfelker · Sep 23, 2020 · b29ed18 · b29ed18
1 parent 87157fa
commit b29ed18
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;