X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=30bfa0a07e854f4f0edd55c3ad6e5878dc22df6e;hp=608ab305b5ba9d8a5b7588111b80a7296a892f53;hb=f26168c62381bad692b6ccd782ba73336bfce180;hpb=62b461473d873dc9c8526ede92630fd70e3f7c21

diff --git a/upstream/Makefile b/upstream/Makefile
index 608ab30..30bfa0a 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -2,13 +2,12 @@
 
 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
-url_gcc-gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).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++,pascal,f77"
+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
@@ -26,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)
@@ -51,13 +52,59 @@ 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
 	cd download && wget --passive-ftp -N $(url_$*)
 	touch $@
 
-tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-gpc tasks/download_gcc-g77
+tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++
 	touch $@
 
 tasks/extract_%: tasks/download_%
@@ -72,10 +119,6 @@ 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 -
-	cd build && gzip -dc ../download/gpc-$(version_gpc).tar.gz | tar xf - && \
-			rm -rf gcc-$(version_gcc)/gcc/p/; mv gpc-$(version_gpc)/p gcc-$(version_gcc)/gcc/p
-	rmdir build/gpc-$(version_gpc)
 	touch $@
 
 tasks/patch_%: tasks/extract_%
@@ -105,16 +148,16 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 	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)/install/bin/mips-unknown-elf-gcc && \
+		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" GCC_FOR_TARGET=$(usr)/bin/mips-unknown-elf-gcc && \
 		$(MAKE) install
 	touch $@