url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f
-darcs_gcclass = http://gcclass.darcs.brianweb.net/
-darcs_classgen = http://classgen.darcs.brianweb.net/
+darcs_gcclass = http://darcs.brianweb.net/gcclass
+darcs_classgen = http://darcs.brianweb.net/classgen
.SECONDARY: # This is broken in gmake < 3.79.1
tasks/build_newlib: tasks/build_gcc
cross_root := $(usr)/mips-unknown-elf
-libc_a := $(cross_root)/lib/libc.a
tasks/download_%:
if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi
touch $@
update_darcs_%: tasks/extract_darcs_%
- if [ -d "build/$*/darcs" ]; then \
+ if [ -d "build/$*/_darcs" ]; then \
cd "build/$*" && darcs pull; \
- else
- cd "build/$*" && wget -nH -rl 16 -N -X _darcs $(darcs_$*); \
+ else \
+ cd "build/$*" && wget -np -nH --cut-dirs=1 -rl 16 -N -X _darcs $(darcs_$*); \
fi
rm "tasks/build_darcs_$*" # to force a rebuild
cd $(cross_root)/include && sh $<
touch $@
-tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob misc/extraheaders.sh $(patsubst %,$(root)/build/org/ibex/nestedvm/%.o, crt0 support support_aux)
+top_lev_stuff := $(patsubst %,../build/org/ibex/nestedvm/%.o, crt0 support support_aux)
+
+$(top_lev_stuff):
# HACK: Get the top level makefile to build the support stuff
- $(MAKE) -s -C $(root) $(patsubst %,build/org/ibex/nestedvm/%.o, crt0 support support_aux)
+ $(MAKE) -C .. $(top_lev_stuff:../%=%)
+tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob misc/extraheaders.sh $(top_lev_stuff)
# Add our support stuff to libc
- mips-unknown-elf-ar sr $(libc_a) $(patsubst %,$(root)/build/org/ibex/nestedvm/%.o, support support_aux)
+ mips-unknown-elf-ar sr $(cross_root)/lib/libc.a $(patsubst %,../build/org/ibex/nestedvm/%.o, support support_aux)
+ mips-unknown-elf-ar sr $(cross_root)/lib/single-float/libc.a $(patsubst %,../build/org/ibex/nestedvm/%.o, support support_aux)
rm -f $(cross_root)/lib/crt0.o
cp $(root)/build/org/ibex/nestedvm/crt0.o $(cross_root)/lib/crt0.o