Browse Source

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.
Rich Felker 4 years ago
parent
commit
b29ed1829e

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;