X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=bade84677a6f6af42c459c8d29827beb456f37b2;hp=5360084f0b81bcbc3705205d1518e01792c6c715;hb=bdcb66ca8ab2d0ff484d2733fcbf7db1dcc5aeb0;hpb=efbc1822d80a8fb04447731bb33d64d3537f8121 diff --git a/upstream/Makefile b/upstream/Makefile index 5360084..bade846 100644 --- a/upstream/Makefile +++ b/upstream/Makefile @@ -1,6 +1,8 @@ # Inspired by XWT's Makefile.upstream -version_gcc = 3.3.3 +version_gcc = 3.3 +version_gpc = 20030830 +version_texinputs = 1.0 url_gcc-core = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz url_gcc-c++ = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch @@ -9,12 +11,12 @@ configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++" version_binutils = 2.14 url_binutils = ftp://ftp.gnu.org/gnu/binutils/binutils-$(version_binutils).tar.gz -patches_binutils = binutils-no64.patch +patches_binutils = binutils-no64.patch binutils-nocompilein.patch configure_binutils = --target=mips-unknown-elf 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 +patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-vasprintf.patch newlib-nomemcpy.patch configure_newlib = --enable-multilib --target=mips-unknown-elf url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz @@ -23,6 +25,8 @@ url_regex = ftp://ftp.zoo.toronto.edu/pub/regex.shar version_bcel = 5.1 url_bcel = http://mirrors.mix5.com/apache/jakarta/bcel/binaries/bcel-$(version_bcel).tar.gz +url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f + .SECONDARY: # This is broken in gmake < 3.79.1 upstream = $(shell pwd) @@ -55,16 +59,75 @@ tasks/full_toolchain: tasks/build_binutils tasks/build_gcc_step2 tasks/build_lib touch $@ -tasks/build_gcc: tasks/build_binutils -tasks/build_newlib: tasks/build_gcc +tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob + # HACK: Get the top level makefile to build the support stuff + make -s -C $(root) build/org/ibex/nestedvm/{crt0.o,support.o,support_aux.o} + + # Add our support stuff to libc + mips-unknown-elf-ar sr $(libc_a) $(root)/build/org/ibex/nestedvm/{support.o,support_aux.o} + rm -f $(cross_root)/lib/crt0.o + cp $(root)/build/org/ibex/nestedvm/crt0.o $(cross_root)/lib/crt0.o -tasks/build_libc: tasks/build_newlib tasks/build_regex tasks/build_openbsdglob + touch $@ + +tasks/build_linker: tasks/build_binutils $(root)/src/org/ibex/nestedvm/linker.ld + cp $(root)/src/org/ibex/nestedvm/linker.ld $(cross_root)/lib/ldscripts/nestedvm.ld + for f in $(cross_root)/lib/ldscripts/elf32ebmip.*; do \ + rm -f "$$f"; \ + ln -s nestedvm.ld "$$f"; \ + done touch $@ clean_%: rm -rf "build/$(*)"* rm -f "tasks/build_$*" "tasks/patch_$*" "tasks/extract_$*" + +gpc := $(usr)/bin/mips-unknown-elf-gpc +gpc_flags := --big-endian -w -lgpc -lc $(usr)/mips-unknown-elf/lib/support*.o +gpc_flags += -Wl,-T,$(usr)/mips-unknown-elf/lib/linker.ld +g77 := $(usr)/bin/mips-unknown-elf-g77 +g77_flags := --big-endian -w -lg2c -lc $(usr)/mips-unknown-elf/lib/support*.o +g77_flags += -Wl,-T,$(usr)/mips-unknown-elf/lib/linker.ld + +# FIXME ugly path hacks evil bad +nestedvm := java -cp $(usr)/../build/bcel/bcel-5.1.jar:$(usr)/../../build org.ibex.nestedvm.Compiler -outformat class + +tasks/download_tex: ; mkdir -p build/tex; touch $@ +build/tex/tex.web: ; curl -o $@ http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.web +build/dtex/tangle.p: ; curl http://www.gnu-pascal.de/crystal/gpc/en/attachments/5593/tangle.p.gz | zcat > $@ +tasks/extract_tex: build/tex/tex.web build/tex/tangle.p; touch $@ + +build/tex/tangle.mips: build/tex/tangle.p tasks/full_toolchain tasks/extract_tex tasks/build_gcc_step2 + cd build/tex; $(gpc) tangle.p $(gpc_flags) -o tangle.mips +build/tex/Tangle.class: build/tex/tangle.mips + $(nestedvm) -o unixruntime -outfile $@ Tangle $< +build/tex/tex.p: build/tex/tex.web build/tex/tex.ch build/tex/Tangle.class + rm -f build/tex/tex.p build/tex/tex.pool + cd build/tex; java -cp .:$(usr)/../../build Tangle \ + --gpc-rts=-nPascalfile:tex.p \ + --gpc-rts=-npool:tex.pool \ + --gpc-rts=-nwebfile:tex.web \ + --gpc-rts=-nchangefile:tex.ch +build/tex/tex.mips: build/tex/tex.p tasks/full_toolchain tasks/build_gcc_step2 + cd build/tex; $(gpc) tex.p $(gpc_flags) -o tex.mips +tasks/build_tex: build/tex/tex.mips + cd build/tex; $(nestedvm) -o unixruntime -outfile TeX.class TeX tex.mips + touch $@ +tasks/extract_texinputs: tasks/build_tex tasks/download_texinputs + cd build/tex; tar xvzf ../../download/texinputs-1.0.tgz + touch $@ +tasks/extract_linpack: tasks/download_linpack ; touch $@ +tasks/download_linpack: + mkdir -p build/linpack + cd build/linpack; wget -N http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f + touch $@ + +tasks/build_linpack: tasks/full_toolchain tasks/extract_linpack + cd build/linpack; $(g77) linpack_bench.f $(g77_flags) -o linpack.mips + cd build/linpack; $(nestedvm) -o unixruntime -outfile Linpack.class Linpack linpack.mips + touch $@ + tasks/download_%: if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi mkdir -p download @@ -97,7 +160,6 @@ tasks/patch_%: tasks/extract_% tasks/build_%: tasks/patch_% mkdir -p $(usr) - @[ "$*" = "newlib" ] && rm -f $(usr)/mips-unknown-elf/lib/crt0.o || true mkdir -p build/$*-obj && cd build/$*-obj && \ ../$*-$(version_$*)/configure --prefix=$(usr) $(configure_$*) && \ $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \ @@ -105,10 +167,27 @@ tasks/build_%: tasks/patch_% touch $@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc + for f in crt0.o support.o support_aux.o; do \ + rm -f "$(usr)/mips-unknown-elf/lib/$$f"; \ + ln -s "$(root)/build/org/ibex/nestedvm/$$f" "$(usr)/mips-unknown-elf/lib/$$f"; \ + done + + rm -f "$(usr)/mips-unknown-elf/lib/linker.ld" + ln -s "$(root)/src/org/ibex/nestedvm/linker.ld" "$(usr)/mips-unknown-elf/lib/linker.ld" + + if [ ! -e "$(usr)/mips-unknown-elf/include/getopt.h" ]; then \ + echo '#include ' > "$(usr)/mips-unknown-elf/include/getopt.h"; \ + fi + + mips-unknown-elf-gcc -dumpspecs \ + | sed '/startfile:$$/{n;s/crt0%O%s/crt0%O%s support%O%s support_aux%O%s/;};' \ + | sed '/link_command:$$/{n;s/%{T\*}/%{T*} %{!T:-T linker.ld%s}/;};' \ + > "$(usr)/lib/gcc-lib/mips-unknown-elf/$(version_gcc)/specs" + mkdir -p $(usr) mkdir -p build/gcc-obj && cd build/gcc-obj && \ - ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \ - $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \ + echo | ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \ + $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" GCC_FOR_TARGET=$(usr)/bin/mips-unknown-elf-gcc && \ $(MAKE) install touch $@ @@ -143,12 +222,6 @@ tasks/build_regex: tasks/download_regex tasks/build_newlib # to build or run mips2java # -tasks/build_freetype: tasks/full_toolchain -tasks/build_libjpeg: tasks/full_toolchain -tasks/build_boehmgc: tasks/full_toolchain -tasks/build_libmspack: tasks/full_toolchain -tasks/build_freetype: tasks/full_toolchain - version_libjpeg = 6b url_libjpeg = http://www.ijg.org/files/jpegsrc.v$(version_libjpeg).tar.gz @@ -164,11 +237,10 @@ version_boehmgc = 6.3alpha2 url_boehmgc = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc$(version_boehmgc).tar.gz patches_boehmgc = boehm-gc.patch -version_busybox = 0.60.5 +version_busybox = 1.00-pre9 url_busybox = http://busybox.net/downloads/busybox-$(version_busybox).tar.gz patches_busybox = busybox.patch - tasks/extract_libjpeg: tasks/download_libjpeg mkdir -p build cd build && \ @@ -178,7 +250,7 @@ tasks/extract_libjpeg: tasks/download_libjpeg ln -s libjpeg-$(version_libjpeg) libjpeg touch $@ -tasks/build_libjpeg: tasks/patch_libjpeg +tasks/build_libjpeg: tasks/patch_libjpeg tasks/build_libc cd build/libjpeg-$(version_libjpeg) && \ ./configure && \ make CC="mips-unknown-elf-gcc" \ @@ -188,7 +260,7 @@ tasks/build_libjpeg: tasks/patch_libjpeg LDFLAGS="$(MIPS_LDFLAGS)" touch $@ -tasks/extract_libmspack: tasks/download_libmspack +tasks/extract_libmspack: tasks/download_libmspack tasks/build_libc mkdir -p build cd build && \ gzip -dc ../download/libmspack-$(version_libmspack).tar.gz | tar xf - && \ @@ -197,7 +269,7 @@ tasks/extract_libmspack: tasks/download_libmspack ln -s libmspack-$(version_libmspack) libmspack touch $@ -tasks/build_libmspack: tasks/patch_libmspack tasks/full_toolchain +tasks/build_libmspack: tasks/patch_libmspack tasks/build_libc cd build/libmspack-$(version_libmspack)/mspack && \ make CC="mips-unknown-elf-gcc" \ AR="mips-unknown-elf-ar" \ @@ -205,7 +277,7 @@ tasks/build_libmspack: tasks/patch_libmspack tasks/full_toolchain OPTIM="$(MIPS_CFLAGS)" touch $@ -tasks/build_freetype: tasks/patch_freetype tasks/full_toolchain +tasks/build_freetype: tasks/patch_freetype tasks/build_libc cd build/freetype-$(version_freetype) && \ $(MAKE) setup ansi && \ $(MAKE) CC="mips-unknown-elf-gcc" \ @@ -225,7 +297,7 @@ tasks/extract_boehmgc: tasks/download_boehmgc ln -s gc$(version_boehmgc) boehmgc-$(version_boehmgc) touch $@ -tasks/build_boehmgc: tasks/patch_boehmgc tasks/full_toolchain +tasks/build_boehmgc: tasks/patch_boehmgc tasks/build_libc cd build/gc$(version_boehmgc) && \ CC="mips-unknown-elf-gcc" CFLAGS="$(MIPS_CFLAGS)" LDFLAGS="$(MIPS_LDFLAGS)" \ ./configure --host=mips-unknown-elf --disable-shared --disable-threads && \ @@ -233,9 +305,14 @@ tasks/build_boehmgc: tasks/patch_boehmgc tasks/full_toolchain make gctest touch $@ -tasks/build_busybox: tasks/patch_busybox tasks/full_toolchain +tasks/build_busybox: tasks/patch_busybox tasks/build_libc cd build && \ rm -f busybox && \ ln -s busybox-$(version_busybox) busybox - cd build/busybox && $(MAKE) SHELL=/bin/bash LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -g" + cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g" + touch $@ + +tasks/build_gcclass: + cd build && darcs get --verbose http://darcs.brianweb.net/gcclass + cd build/gcclass && make touch $@