X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=d9077b2bf3e67ea7bfaa4c8a1822b60c6fd90a60;hp=aa22d6a0c30fe6ceb3473a5dcb1908fd76a971c2;hb=d378b7501493003be1a0d99f8ef67d0294b82221;hpb=bcad568d15f3bfdfc4b7c3768ecd27023a7ac94a

diff --git a/upstream/Makefile b/upstream/Makefile
index aa22d6a..d9077b2 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -1,10 +1,13 @@
 # Inspired by XWT's Makefile.upstream
 
-version_gcc = 3.3
+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++,f77"
 
@@ -78,48 +81,13 @@ 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
-
-# FIXME ugly path hacks evil bad
-nestedvm := java -cp $(usr)/../build/bcel/bcel-5.1.jar:$(usr)/../../build org.ibex.nestedvm.Compiler -outformat class
-
-version_texinputs = 1.0
-url_texinputs = http://www.megacz.com/tmp/texinputs-$(version_texinputs).tgz
-
-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/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++
+tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-g77
 	touch $@
 
 tasks/extract_%: tasks/download_%
@@ -134,6 +102,7 @@ tasks/extract_gcc: tasks/download_gcc
 	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-g77-$(version_gcc).tar.gz | tar xf -
 	touch $@
 
 tasks/patch_%: tasks/extract_%
@@ -233,6 +202,9 @@ 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 && \
@@ -301,10 +273,43 @@ tasks/build_busybox: tasks/patch_busybox tasks/build_libc
 	cd build && \
 		rm -f busybox && \
 		ln -s busybox-$(version_busybox) busybox
-	cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g"
+	cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(filter-out -Werror,$(MIPS_CFLAGS)) -DNESTEDVM -g"
 	touch $@
 
 tasks/build_gcclass:
 	cd build &&  darcs get --verbose http://darcs.brianweb.net/gcclass
 	cd build/gcclass && make
 	touch $@
+
+# 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 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 $(filter-out -Werror,$(MIPS_PCFLAGS)) tex.p $(MIPS_LDFLAGS) -o tex.mips
+	touch $@