From 92b81fde24beb5dfaec1c2eec3960a61cc6dd5e0 Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Wed, 23 Jul 2014 11:59:02 +0000 Subject: [PATCH] WEAKASM aliases (_sys_foo) are now provided by rumpsrc. This makes it possible to build pthread_cancelstub.c --- buildxen.sh | 1 - lib/_lwp.c | 2 -- rumpsrc | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/buildxen.sh b/buildxen.sh index 757111c..0f23e0c 100755 --- 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 0987751..73b6e14 100644 --- 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 ac9abae..496d525 160000 --- a/rumpsrc +++ b/rumpsrc @@ -1 +1 @@ -Subproject commit ac9abae132b0ab981060fe2d426058c550e6af05 +Subproject commit 496d525fec29073211153f0c20f1e97a981c6dbd -- 2.39.5