Disable pthread assert for riscv

Let's see how far this can go in testing.

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2020-01-17 19:56:49 +02:00
parent 4916a7212e
commit 4a959b9846
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
3 changed files with 16 additions and 17 deletions

View File

@ -1,14 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 363afee..3276ade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -770,6 +770,9 @@ AS_CASE(["$target_os"],
enable_pthread=yes
])
+# Disable pthread on RISC-V until compile assert is sorted out
+AS_CASE(["$target_cpu"],[riscv*],[enable_pthread=no],[])
+
dnl Checks for libraries.
AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])

View File

@ -0,0 +1,13 @@
diff --git a/thread_pthread.c b/thread_pthread.c
index 670e917..d466d10 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1992,7 +1992,7 @@ rb_sigwait_fd_put(const rb_thread_t *th, int fd)
VM_ASSERT(signal_self_pipe.normal[0] == fd);
old = ATOMIC_PTR_EXCHANGE(sigwait_th, THREAD_INVALID);
- if (old != th) assert(old == th);
+ /* if (old != th) assert(old == th); */
}
#ifndef HAVE_PPOLL

View File

@ -148,8 +148,8 @@ Patch12: rubygems-3.0.3-Avoid-rdoc-hook-when-its-failed-to-load-rdoc-library.pat
# https://github.com/ruby/openssl/pull/216
Patch22: ruby-2.6.0-config-support-include-directive.patch
# Disable pthread on Linux RISC-V (riscv64)
Patch30: riscv-disable-pthread.patch
# Disable pthread assert on Linux RISC-V (riscv64)
Patch30: ruby-2.6.5-disable-assert.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Suggests: rubypick
@ -1183,7 +1183,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
%changelog
* Tue Jul 23 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 2.6.5-124.0.riscv64
- Disable pthread on RISC-V (riscv64)
- Disable pthread assert on RISC-V (riscv64)
* Tue Oct 08 2019 Slava Kardakov <ojab@ojab.ru> - 2.6.5-124
- Update to Ruby 2.6.5.