WEAKASM aliases (_sys_foo) are now provided by rumpsrc.

This makes it possible to build pthread_cancelstub.c

diff --git a/buildxen.sh b/buildxen.sh
index 757111c4084d15a90ce27e9e52a7b32735a0263c..0f23e0c65c618ad058fbeea16ee8f0d6a29ac2db 100755 (executable)
--- a/buildxen.sh
+++ b/buildxen.sh
@@ -39,7 +39,6 @@ echo 'CPPFLAGS+=-DMAXPHYS=32768' >> rumptools/mk.conf
 # cycles with just "rumpmake"
 cat >> rumptools/mk.conf << EOF
 .if defined(LIB) && \${LIB} == "pthread"
-PTHREAD_CANCELSTUB=no
 CPPFLAGS+=      -D_PLATFORM_MAKECONTEXT=_lwp_rumpxen_makecontext
 CPPFLAGS+=      -D_PLATFORM_GETTCB=_lwp_rumpxen_gettcb
 .endif  # LIB == pthread

diff --git a/lib/_lwp.c b/lib/_lwp.c
index 098775184643dd5235961c868c5554b4158904ab..73b6e147a3f63f99e180117c784bfbcbeb815bb3 100644 (file)
--- a/lib/_lwp.c
+++ b/lib/_lwp.c
@@ -330,8 +330,6 @@ __strong_alias(_sys_setcontext,_lwpabort);
 __strong_alias(_lwp_kill,_lwpabort);
 
 __strong_alias(_sys___sigprocmask14,_lwpnullop);
-__strong_alias(_sys___nanosleep50,_lwpnullop);
-__strong_alias(_sys_write,_lwpnullop);
 
 __strong_alias(pthread__cancel_stub_binder,_lwpnullop);
 

diff --git a/rumpsrc b/rumpsrc
index ac9abae132b0ab981060fe2d426058c550e6af05..496d525fec29073211153f0c20f1e97a981c6dbd 160000 (submodule)
--- a/rumpsrc
+++ b/rumpsrc
@@ -1 +1 @@
-Subproject commit ac9abae132b0ab981060fe2d426058c550e6af05
+Subproject commit 496d525fec29073211153f0c20f1e97a981c6dbd