version_newlib = 1.11.0
url_newlib = http://mirrors.rcn.net/pub/sourceware/newlib/newlib-$(version_newlib).tar.gz
-patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-vasprintf.patch newlib-nomemcpy.patch
+patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-nomemcpy.patch newlib-unix.patch
configure_newlib = --enable-multilib --target=mips-unknown-elf
url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz
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 $@
tasks/extract_%: tasks/download_%
+ if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
mkdir -p build
cd build && \
gzip -dc ../download/$*-$(version_$*).tar.gz | $(TAR) -xf - && \
touch $@
tasks/extract_darcs_%:
+ if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
mkdir -p build
if [ -z "$(darcs_$*)" ]; then echo "No darcs url for $*" >&2; false; fi
if [ -d "$(root)/_darcs" ]; then \
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
tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-g77
touch $@
-tasks/extract_%: tasks/download_%
- mkdir -p build
- cd build && \
- gzip -dc ../download/$*-$(version_$*).tar.gz | $(TAR) -xf - && \
- rm -f $* && \
- ln -s $*-$(version_$*) $*
- touch $@
-
tasks/extract_gcc: tasks/download_gcc
+ if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
mkdir -p build
cd build && gzip -dc ../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf -
cd build && gzip -dc ../download/gcc-g++-$(version_gcc).tar.gz | $(TAR) -xf -
touch $@
tasks/patch_%: tasks/extract_%
+ if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
cd build/$*-$(version_$*) && \
for p in $(patches_$*) end; do \
[ "$$p" = "end" ] || $(PATCH) -p0 < ../../patches/$$p || exit 1; \
touch $@
tasks/extract_gpc: tasks/download_gcc tasks/download_gpc
+ if [ -e $@ ]; then echo "Error: $@ exists. something isn't right"; false; else true; fi
mkdir -p build/gpc.extract
cd build/gpc.extract && \
gzip -dc ../../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf - && \
cp misc/tex.ch build/tex/tex.ch
cd build/tex && \
$(TAR) xfz ../../download/texinputs-$(version_texinputs).tgz && \
- java -cp $(root)/build tests.Tangle \
+ java -cp $(root)/build:$(upstream)/build/classgen/build tests.Tangle \
--gpc-rts=-nPascalfile:tex.p \
--gpc-rts=-npool:tex.pool \
--gpc-rts=-nwebfile:tex.web \