Don't build _lwp.o

Main reason: it doesn't work or do anything useful here.
rumpkernel · Sep 9, 2015 · c8562ed · c8562ed
1 parent 0a5d62b
commit c8562ed
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 300 deletions.
diff --git a/Makefile b/Makefile
@@ -84,9 +84,6 @@ rumpremote.sh: rumpremote.sh.in
 rumpctrl.sh: rumpctrl.sh.in
 		sed 's,XXXPATHXXX,$(PWD),' $< > $@
 
-_lwp.o:		_lwp_pthread.c ${NBCC}
-		${NBCC} ${NBCFLAGS} -c $< -o $@
-
 emul.o:		emul.c
 		${CC} ${HOSTCFLAGS} -c $< -o $@
 
@@ -113,7 +110,7 @@ pthread_test.o:	pthread_test.c ${MAPS} ${NBCC}
 
 MAPS=rump.map namespace.map host.map netbsd.map readwrite.map emul.map weakasm.map
 
-${BINDIR}/halt:	halt.o _lwp.o emul.o rumpclient.o readwrite.o remoteinit.o ${MAPS}
+${BINDIR}/halt:	halt.o emul.o rumpclient.o readwrite.o remoteinit.o ${MAPS}
 		${NBCC} ${NBCFLAGS} -o ${BINDIR}/halt halt.o
 
 rump.map:	${RUMPSRC}/sys/rump/rump.sysmap
@@ -134,7 +131,7 @@ rumpobj/${1}/${2}.ro:
 
 NBLIBS.${2}:= $(shell cd ${RUMPSRC}/${1} && ${RUMPMAKE} -V '$${LDADD}' | sed 's/-L\S*//g')
 LIBS.${2}=$${NBLIBS.${2}:-l%=rump/lib/lib%.a}
-${BINDIR}/${2}: rumpobj/${1}/${2}.ro _lwp.o emul.o rumpclient.o readwrite.o remoteinit.o netbsd_init.o ${MAPS} $${LIBS.${2}}
+${BINDIR}/${2}: rumpobj/${1}/${2}.ro emul.o rumpclient.o readwrite.o remoteinit.o netbsd_init.o ${MAPS} $${LIBS.${2}}
 	${NBCC} ${NBCFLAGS} -o ${BINDIR}/${2} rumpobj/${1}/${2}.ro $${LIBS.${2}}
 
 ${2}:	${BINDIR}/${2}

diff --git a/_lwp_pthread.c b/_lwp_pthread.c
diff --git a/emul.c b/emul.c
@@ -269,6 +269,9 @@ STUB(emul_uuidgen);
 
 STUB(emul_minherit);
 
+STUB(emul__lwp_self);
+STUB(emul___libc_static_tls_setup);
+
 STUB_ABORT(emul_undelete);
 STUB_ABORT(emul_sigqueueinfo);
 STUB_ABORT(emul__setcontext);

diff --git a/emul.map b/emul.map
@@ -18,4 +18,6 @@ undelete	emul_undelete
 uuidgen		emul_uuidgen
 sigqueueinfo	emul_sigqueueinfo
 _lwp_kill	emul__lwp_kill
+_lwp_self	emul__lwp_self
 _setcontext     emul__setcontext
+__libc_static_tls_setup	emul___libc_static_tls_setup
diff --git a/ld.in b/ld.in
@@ -81,7 +81,7 @@ ${OBJCOPY} --redefine-syms=@PATH@/weakasm.map ${TMPFILE3}
 ${OBJCOPY} --redefine-syms=@PATH@/readwrite.map ${TMPFILE3}
 ${OBJCOPY} --redefine-syms=@PATH@/emul.map ${TMPFILE3}
 ${OBJCOPY} --redefine-syms=@PATH@/netbsd.map ${TMPFILE3}
-${CC} ${LDFLAGS} -Wl,-r -nostdlib -Wl,-dc ${TMPFILE3} @PATH@/_lwp.o @PATH@/readwrite.o -o ${TMPFILE4}  2>/dev/null
+${CC} ${LDFLAGS} -Wl,-r -nostdlib -Wl,-dc ${TMPFILE3} @PATH@/readwrite.o -o ${TMPFILE4}  2>/dev/null
 ${OBJCOPY} --redefine-syms=@PATH@/errno.map ${TMPFILE4}
 ${OBJCOPY} -w --localize-symbol='*' ${TMPFILE4}
 ${OBJCOPY} -w --globalize-symbol='_netbsd_*' ${TMPFILE4}

diff --git a/mkremote.sh b/mkremote.sh
@@ -34,7 +34,7 @@ objcopy --redefine-syms=weakasm.map ${OBJDIR}/tmp1_${NAME}.o
 objcopy --redefine-syms=readwrite.map ${OBJDIR}/tmp1_${NAME}.o
 objcopy --redefine-syms=emul.map ${OBJDIR}/tmp1_${NAME}.o
 objcopy --redefine-syms=netbsd.map ${OBJDIR}/tmp1_${NAME}.o
-${CC} ${LDFLAGS} -Wl,-r -nostdlib -Wl,-dc ${OBJDIR}/tmp1_${NAME}.o _lwp.o readwrite.o -o ${OBJDIR}/tmp2_${NAME}.o  2>/dev/null
+${CC} ${LDFLAGS} -Wl,-r -nostdlib -Wl,-dc ${OBJDIR}/tmp1_${NAME}.o readwrite.o -o ${OBJDIR}/tmp2_${NAME}.o  2>/dev/null
 objcopy --redefine-syms=errno.map ${OBJDIR}/tmp2_${NAME}.o
 objcopy -w --localize-symbol='*' ${OBJDIR}/tmp2_${NAME}.o
 objcopy -w --globalize-symbol='_netbsd_*' ${OBJDIR}/tmp2_${NAME}.o

diff --git a/netbsd_init.c b/netbsd_init.c
@@ -25,6 +25,4 @@ _netbsd_init(int stdouttty)
 
 	if (stdouttty)
 		setlinebuf(stdout);
-
-	_lwp_rumprun_scheduler_init();
 }
diff --git a/netbsd_init.h b/netbsd_init.h
@@ -1,5 +1,3 @@
 void _netbsd_init(int);
 
-void _lwp_rumprun_scheduler_init(void);
-
 int  rumprun_ucontext(void *, size_t, void (*)(void *), void *, void *, size_t);