summaryrefslogtreecommitdiff
path: root/sys/src/9
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2014-12-15 01:43:31 +0100
committercinap_lenrek <cinap_lenrek@felloff.net>2014-12-15 01:43:31 +0100
commitc8ed49da608c1c99ec6dab7a6e9bbc26f3f05277 (patch)
tree59bd0d78afc77bc78ded99df20d9d4bc542182af /sys/src/9
parent07a776fad9c93ecc8b0635a9d96107b729ca0469 (diff)
xen: fix cross build
Diffstat (limited to 'sys/src/9')
-rw-r--r--sys/src/9/xen/mkfile17
-rw-r--r--sys/src/9/xen/utilmkfile5
2 files changed, 12 insertions, 10 deletions
diff --git a/sys/src/9/xen/mkfile b/sys/src/9/xen/mkfile
index 560efa422..5d9633439 100644
--- a/sys/src/9/xen/mkfile
+++ b/sys/src/9/xen/mkfile
@@ -93,17 +93,17 @@ SDEV=`{echo devsd.c sd*.c | sed 's/\.c/.'$O'/g'}
PAE=`{echo $PAE | sed 's/yes/yes[extended-cr3]/'}
XENELF='LOADER=generic,XEN_VER=xen-3.0,ELF_PADDR_OFFSET=0,VIRT_BASE='$KZERO',VIRT_ENTRY='$KTZERO',PAE='$PAE
-#$p$CONF: $CONF.c $OBJ $LIB xenbin
+#$p$CONF: $CONF.c $OBJ $LIB xenbin.$cputype
# $CC $CFLAGS '-DKERNDATE='`{date -n} $CONF.c
# $LD -o $target.tmp -T$KTZERO -l $OBJ $CONF.$O $LIB
-# ./xenbin <$target.tmp >$target
+# ./xenbin.$cputype <$target.tmp >$target
# rm $target.tmp
# size $target
-$p$CONF: $CONF.c $OBJ $LIB xenelf
+$p$CONF: $CONF.c $OBJ $LIB xenelf.$cputype
$CC $CFLAGS '-DKERNDATE='`{date -n} $CONF.c
$LD -o $target.elf -H5 -T$KTZERO -P$KPZERO -l $OBJ $CONF.$O $LIB
- ./xenelf $target.elf $target __xen_guest ''$XENELF''
+ ./xenelf.$cputype $target.elf $target __xen_guest ''$XENELF''
size $target
$p$CONF.gz: $p$CONF
@@ -176,13 +176,10 @@ dpart: dpart.$O
xenstore: xenstore.$O
$LD -o xenstore xenstore.$O
-# XXX this is wrong if we're cross-compiling
-xenbin: xenbin.$O
- $LD -o xenbin xenbin.$O
-xenelf: xenelf.$O
- $LD -o xenelf xenelf.$O
+xenbin.$cputype xenelf.$cputype: utilmkfile
+ mk -f utilmkfile $target
%.clean:V:
- rm -f $stem.c [9bz]$stem [9bz]$stem.gz 9$stem.elf boot$stem.* reboot.h init.h xendat.h xendefs.h $PCHEADERS dpart xenbin xenelf xenstore
+ rm -f $stem.c [9bz]$stem [9bz]$stem.gz 9$stem.elf boot$stem.* reboot.h init.h xendat.h xendefs.h $PCHEADERS dpart xenbin.$cputype xenelf.$cputype xenstore
diff --git a/sys/src/9/xen/utilmkfile b/sys/src/9/xen/utilmkfile
new file mode 100644
index 000000000..4d88e452d
--- /dev/null
+++ b/sys/src/9/xen/utilmkfile
@@ -0,0 +1,5 @@
+</$cputype/mkfile
+</sys/src/cmd/mkone
+
+%.$cputype: %.$O
+ $LD -o $target $prereq