X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=4ba354d427eb8114299e733eafcc6536b4e84dd6;hp=3a5cd7b0efb02ae115e11964b53cf7317be4c757;hb=bf8bdc9b451be5541aa63eb43e16eed1f34eb5db;hpb=18ecce5ea457fb0839a543ecbbfedcfd23b7b168

diff --git a/upstream/Makefile b/upstream/Makefile
index 3a5cd7b..4ba354d 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -1,13 +1,15 @@
 # Inspired by XWT's Makefile.upstream
 
-version_gcc = 3.3
-version_gpc = 20030830
-version_texinputs = 1.0
+version_gcc = 3.3.3
+
 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
+url_gcc-g77 = http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz
+
 patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch
+
 configure_gcc = --target=mips-unknown-elf --disable-threads --with-gnu-ld --with-gnu-as --with-newlib=yes --enable-sjlj-exceptions --enable-languages="c"
-configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++"
+configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++,f77"
 
 version_gpc = 20030830
 url_gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).tar.gz
@@ -27,11 +29,11 @@ configure_newlib = --enable-multilib --target=mips-unknown-elf
 url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz
 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
 
+darcs_gcclass = http://darcs.brianweb.net/gcclass
+darcs_classgen = http://darcs.brianweb.net/classgen
+
 .SECONDARY: # This is broken in gmake < 3.79.1
 
 upstream = $(shell pwd)
@@ -43,24 +45,67 @@ export PATH
 
 # Solaris' patch doesn't work, use gnu patch on solaris
 PATCH = $(shell test `uname` = SunOS && echo gpatch || echo patch)
+TAR = $(shell test `uname` = SunOS && echo gtar || echo tar)
 
 tasks/build_gcc: tasks/build_linker
 tasks/build_newlib: tasks/build_gcc
 
 cross_root := $(usr)/mips-unknown-elf
-libc_a := $(cross_root)/lib/libc.a
 
-tasks/build_extraheaders: $(upstream)/patches/newlib-extraheaders.sh tasks/build_newlib
+tasks/download_%:
+	if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi
+	mkdir -p download
+	cd download && wget --passive-ftp -N $(url_$*)
+	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 - && \
+		rm -f $* && \
+		ln -s $*-$(version_$*) $*
+	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 \
+		cd build && darcs get --repo-name="$*" --verbose "$(darcs_$*)"; \
+	else \
+		mkdir -p "build/$*" && cd "build/$*"; \
+		wget -nH -rl 16 -N -X _darcs $(darcs_$*); \
+	fi
+	touch $@
+
+update_darcs_%: tasks/extract_darcs_%
+	if [ -d "build/$*/_darcs" ]; then \
+		cd "build/$*" && darcs pull; \
+	else \
+		cd "build/$*" && wget -np -nH --cut-dirs=1 -rl 16 -N -X _darcs $(darcs_$*); \
+	fi
+	rm "tasks/build_darcs_$*" # to force a rebuild
+
+tasks/build_darcs_%: tasks/extract_darcs_%
+	cd "build/$*" && $(MAKE)
+	touch $@
+
+tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib
 	# Add extra nestedvm specific headers to include
 	cd $(cross_root)/include && sh $<
 	touch $@
 
-tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob
+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) build/org/ibex/nestedvm/{crt0.o,support.o,support_aux.o}
+	$(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)  $(root)/build/org/ibex/nestedvm/{support.o,support_aux.o}
+	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
 
@@ -79,75 +124,19 @@ clean_%:
 	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
-	cd download && wget --passive-ftp -N $(url_$*)
-	touch $@
-
-tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++
-	touch $@
-
-tasks/extract_%: tasks/download_%
-	mkdir -p build
-	cd build && \
-		gzip -dc  ../download/$*-$(version_$*).tar.gz | tar xf - && \
-		rm -f $* && \
-		ln -s $*-$(version_$*) $*
+tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-g77
 	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 -
+	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 -
+	cd build && gzip -dc ../download/gcc-g77-$(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; \
@@ -163,35 +152,19 @@ 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 <unistd.h>' > "$(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 && \
 		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) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
 		$(MAKE) install
 	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 - && \
-		gzip -dc ../../download/gpc-$(version_gpc).tar.gz      | tar xf - && \
+		gzip -dc ../../download/gcc-core-$(version_gcc).tar.gz | $(TAR) -xf - && \
+		gzip -dc ../../download/gpc-$(version_gpc).tar.gz      | $(TAR) -xf - && \
 		test ! -e gcc-$(version_gcc)/gcc/p && \
 		mv gpc-$(version_gpc)/p gcc-$(version_gcc)/gcc/p
 	mv build/gpc.extract/gcc-$(version_gcc) build/gpc-$(version_gpc)
@@ -213,7 +186,7 @@ tasks/build_gpc: tasks/patch_gpc tasks/build_libc
 
 tasks/build_openbsdglob: tasks/download_openbsdglob tasks/build_newlib
 	@mkdir -p $(usr)/mips-unknown-elf/{include,lib}
-	cd build && gzip -dc ../download/openbsdglob.tar.gz | tar xf -
+	cd build && gzip -dc ../download/openbsdglob.tar.gz | $(TAR) -xf -
 	cd build/openbsdglob && \
 		mips-unknown-elf-gcc '-Dissetugid()=0' -DARG_MAX=65536 $(MIPS_CFLAGS) -I. -c -o glob.o glob.c && \
 		mips-unknown-elf-gcc -O2 -Wall -Werror -I. -c -o fnmatch.o fnmatch.c && \
@@ -261,10 +234,13 @@ version_busybox = 1.00-pre9
 url_busybox = http://busybox.net/downloads/busybox-$(version_busybox).tar.gz
 patches_busybox = busybox.patch
 
+version_texinputs = 1.0
+url_texinputs = http://www.megacz.com/tmp/texinputs-$(version_texinputs).tgz
+
 tasks/extract_libjpeg: tasks/download_libjpeg
 	mkdir -p build
 	cd build && \
-		gzip -dc ../download/jpegsrc.v$(version_libjpeg).tar.gz | tar xf - && \
+		gzip -dc ../download/jpegsrc.v$(version_libjpeg).tar.gz | $(TAR) -xf - && \
 		mv jpeg-$(version_libjpeg) libjpeg-$(version_libjpeg) && \
 		rm -f libjpeg && \
 		ln -s libjpeg-$(version_libjpeg)  libjpeg
@@ -283,7 +259,7 @@ tasks/build_libjpeg: tasks/patch_libjpeg tasks/build_libc
 tasks/extract_libmspack: tasks/download_libmspack tasks/build_libc
 	mkdir -p build
 	cd build && \
-		gzip -dc ../download/libmspack-$(version_libmspack).tar.gz | tar xf - && \
+		gzip -dc ../download/libmspack-$(version_libmspack).tar.gz | $(TAR) -xf - && \
 		mv libmspack libmspack-$(version_libmspack) && \
 		rm -f libmspack && \
 		ln -s libmspack-$(version_libmspack)  libmspack
@@ -311,7 +287,7 @@ tasks/extract_boehmgc: tasks/download_boehmgc
 	mkdir -p build
 	cd build && \
 		rm -rf gc$(version_boehmgc) && \
-		gzip -dc ../download/gc$(version_boehmgc).tar.gz | tar xf - && \
+		gzip -dc ../download/gc$(version_boehmgc).tar.gz | $(TAR) -xf - && \
 		rm -f boehmgc boehmgc-$(version_boehmgc) && \
 		ln -s gc$(version_boehmgc)  boehmgc && \
 		ln -s gc$(version_boehmgc)  boehmgc-$(version_boehmgc)
@@ -332,7 +308,35 @@ tasks/build_busybox: tasks/patch_busybox tasks/build_libc
 	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
+# TeX Stuff
+
+tasks/extract_tex_tangle:
+	@mkdir -p build/tex
+	cd build/tex && \
+		curl -o tex.web http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.web && \
+		curl http://www.gnu-pascal.de/crystal/gpc/en/attachments/5593/tangle.p.gz | zcat > tangle.p 
+	touch $@
+
+tasks/build_tex_tangle: tasks/extract_tex_tangle tasks/build_gpc
+	@mkdir -p build/tex
+	mips-unknown-elf-gpc $(MIPS_PCFLAGS) build/tex/tangle.p $(MIPS_LDFLAGS) -o build/tex/tangle.mips
+	touch $@
+
+tasks/build_tex: tasks/build_tex_tangle tasks/build_gpc tasks/download_texinputs
+	@mkdir -p build/tex
+	
+	# HACK: Build Tangel.class
+	make -C $(root) build/tests/Tangle.class
+	
+	rm -f build/tex/tex.p build/tex/tex.pool
+	cp misc/tex.ch build/tex/tex.ch
+	cd build/tex && \
+		$(TAR) xfz ../../download/texinputs-$(version_texinputs).tgz && \
+		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     \
+			--gpc-rts=-nchangefile:tex.ch   \
+			&& \
+		mips-unknown-elf-gpc $(MIPS_PCFLAGS) tex.p $(MIPS_LDFLAGS) -o tex.mips
 	touch $@