Support kernonly mode for Xen

nb. tests/nolibc won't build for xen; hw is hardcoded there

diff --git a/build-rr.sh b/build-rr.sh
index 651d25f3429a0383c6822eb0a008a03f33016e82..495c74a9a50d7e35955f6fb4c9148d3f887efbe2 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -139,10 +139,6 @@ parseargs ()
        [ -d ${PLATFORMDIR} ] || die Platform \"$PLATFORM\" not supported!
        shift
 
-       if ${KERNONLY} && [ "${PLATFORM}" != "hw" ]; then
-               die '-k currently only supports "hw" platform'
-       fi
-
        dodefault=true
        while [ $# -gt 0 ]; do
                if [ $1 = '--' ]; then

diff --git a/platform/xen/Makefile b/platform/xen/Makefile
index 92186727be0750961be0eaee1a399429a5e44013..07e926370a52c76ca6a487c3eb01d369baa0dae5 100644 (file)
--- a/platform/xen/Makefile
+++ b/platform/xen/Makefile
@@ -17,8 +17,16 @@ MAINOBJ= $(abspath $(OBJ_DIR)/rumprun-xen-$(MACHINE_ARCH).o)
 #
 OBJ_DIR ?= $(CURDIR)/obj
 
+TARGETS= prepare links platformlibs mini-os $(MAINOBJ)
+
+ifneq (${KERNONLY},true)
+TARGETS+= app-tools userlibs
+else
+TARGETS+= compiler_rt
+endif
+
 .PHONY: default
-default: prepare links commonlibs mini-os $(MAINOBJ) app-tools
+default: ${TARGETS}
 
 include ../Makefile.inc
 
@@ -63,7 +71,7 @@ mini-os:
 links:
        $(MAKE) -C xen links
 
-$(MAINOBJ): $(RUMP_OBJS) commonlibs
+$(MAINOBJ): $(RUMP_OBJS)
        $(CC) -Wl,-r $(CFLAGS) $(LDFLAGS) $(RUMP_OBJS) -nostdlib -o $@
 
 APP_TOOLS_PLATFORM= xen