remove "local" support

.travis.yml

@@ -7,24 +7,18 @@ before_install:
 
 matrix:
   include:
-    - env: WITHZFS=false THREADING='fiber local' REALCC=gcc
-      compiler: gcc
     - env: WITHZFS=false THREADING=pthread REALCC=gcc
       compiler: gcc
-    - env: WITHZFS=true  THREADING='fiber local' REALCC=gcc
-      compiler: gcc
     - env: WITHZFS=true  THREADING=pthread REALCC=gcc
       compiler: gcc
-    - env: WITHZFS=false THREADING='fiber local' REALCC=clang-3.6
+    - env: WITHZFS=false THREADING=pthread REALCC=clang-3.6
       addons: &clang36
         apt:
           packages:
             - clang-3.6
           sources:
             - ubuntu-toolchain-r-test
             - llvm-toolchain-precise-3.6
-    - env: WITHZFS=false THREADING=pthread REALCC=clang-3.6
-      addons: *clang36
 
 script:
    - CC=$REALCC ./buildnb.sh -qq $(${WITHZFS} && echo zfs) ${THREADING} buildrump tests

Makefile

@@ -86,10 +86,6 @@ LWP=_lwp_pthread.c
 HALT=bin/halt
 endif
 
-ifeq (${BUILDLOCAL},true)
-PTHREAD_TEST=	${BINDIRRR}/pthread_test
-endif
-
 all:		${NBUTILS_BASE} ${HALT} ${PTHREAD_TEST} rumpremote.sh rumpctrl.sh
 
 rumpremote.sh: rumpremote.sh.in
@@ -133,9 +129,6 @@ MAPS=rump.map namespace.map host.map netbsd.map readwrite.map emul.map weakasm.m
 ${BINDIR}/halt:	halt.o _lwp.o emul.o rumpclient.o readwrite.o remoteinit.o ${MAPS}
 		${NBCC} ${NBCFLAGS} -o ${BINDIR}/halt halt.o
 
-${BINDIRRR}/pthread_test: pthread_test.o _lwp.o emul.o netbsd_init.o readwrite.o stub.o rumpinit.o ${MAPS}
-		./mkrun.sh pthread_test pthread_test.o rump/lib/libpthread.a
-
 rump.map:	${RUMPSRC}/sys/rump/rump.sysmap
 		awk '{printf("%s\t%s\n",$$3,$$4)}' $< > $@
 
@@ -157,18 +150,11 @@ 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}}
 	${NBCC} ${NBCFLAGS} -o ${BINDIR}/${2} rumpobj/${1}/${2}.ro $${LIBS.${2}}
 
-${BINDIRRR}/${2}: rumpobj/${1}/${2}.ro _lwp.o emul.o stub.o readwrite.o rumpinit.o netbsd_init.o ${MAPS} $${LIBS.${2}}
-	./mkrun.sh ${2} rumpobj/${1}/${2}.ro $${LIBS.${2}}
-
 ifeq (${BUILDFIBER},true)
 ${2}:	${BINDIRRR}/${2}
 else
-ifeq (${BUILDLOCAL},true)
-${2}:	${BINDIR}/${2} ${BINDIRRR}/${2}
-else
 ${2}:	${BINDIR}/${2}
 endif
-endif
 
 clean_${2}:
 	( [ ! -d ${RUMPSRC}/${1} ] || ( cd ${RUMPSRC}/${1} && ${RUMPMAKE} cleandir && rm -f ${2}.ro ) )

buildnb.sh

@@ -12,7 +12,6 @@ EXTRAFLAGS="${STDJ}"
 TESTS=false
 BUILDZFS=false
 BUILDFIBER=false
-BUILDLOCAL=false
 RUMPSRC=src-netbsd
 
 # figure out where gmake lies
@@ -58,9 +57,6 @@ for arg in "$@"; do
 	"pthread")
 		BUILDFIBER=false
 		;;
-	"local")
-		BUILDLOCAL=true
-		;;
 	*)
 		RUMPLOC=${arg}
 		;;
@@ -176,8 +172,6 @@ for lib in ${LIBS}; do
 	makeuserlib ${lib}
 done
 
-appendconfig BUILDLOCAL
-
 mkdir -p bin
 
 ${MAKE}