]> xenbits.xensource.com Git - people/liuw/rumprun.git/commitdiff
Revert "Use __thread for rump kernel curlwp."
authorAntti Kantee <pooka@iki.fi>
Tue, 5 May 2015 17:10:36 +0000 (17:10 +0000)
committerAntti Kantee <pooka@iki.fi>
Tue, 5 May 2015 17:10:36 +0000 (17:10 +0000)
It does not work with qemu -enable-kvm (for whatever to-be-debugged
reason).

This reverts commit d82d40bece9ff9fe8a47483dd177c351dba86faf.

_build-common.sh

index 4825b32d3896c8db986a26ab406976154f76138f..adf452874129b951a069968070c48c88e58b0131 100755 (executable)
@@ -35,8 +35,7 @@ set -e
 # build tools
 ${BUILDRUMP}/buildrump.sh ${BUILD_QUIET} ${STDJ} -k \
     -V MKPIC=no -s ${RUMPSRC} -T rumptools -o rumpobj \
-    -V RUMP_KERNEL_IS_LIBC=1 -V BUILDRUMP_SYSROOT=yes \
-    -V RUMP_CURLWP=__thread "$@" tools
+    -V RUMP_KERNEL_IS_LIBC=1 -V BUILDRUMP_SYSROOT=yes "$@" tools
 
 [ -n "${BUILDXENMETAL_MKCONF}" ] \
     && echo "${BUILDXENMETAL_MKCONF}" >> rumptools/mk.conf
@@ -48,8 +47,8 @@ MACHINE=$(${RUMPMAKE} -f /dev/null -V '${MACHINE}')
 # build rump kernel
 ${BUILDRUMP}/buildrump.sh ${BUILD_QUIET} ${STDJ} -k \
     -V MKPIC=no -s ${RUMPSRC} -T rumptools -o rumpobj \
-    -V RUMP_KERNEL_IS_LIBC=1 -V BUILDRUMP_SYSROOT=yes \
-    -V RUMP_CURLWP=__thread "$@" build kernelheaders install
+    -V RUMP_KERNEL_IS_LIBC=1 -V BUILDRUMP_SYSROOT=yes "$@" \
+    build kernelheaders install
 
 LIBS="$(stdlibs ${RUMPSRC}) $(pwd)/../../lib/librumprun_tester"
 if [ "$(${RUMPMAKE} -f rumptools/mk.conf -V '${_BUILDRUMP_CXX}')" = 'yes' ]