X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=abbf3aba3d898502a77e6accae0a58eea49c0e68;hp=3841290c0e4f6f1110ee82037919b8e4a672db5f;hb=5b0cc721fd63727616d6e0bb8ec4e8f0dbc39f9b;hpb=17e8d7f62ca2563788f493e950e9b2a16db388eb

diff --git a/upstream/Makefile b/upstream/Makefile
index 3841290..abbf3ab 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -1,18 +1,18 @@
 # Inspired by XWT's Makefile.upstream
 
-version_gcc = 3.3.3
+version_gcc = 3.3.6
 
-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
+url_gcc-core = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-core-$(version_gcc).tar.gz
+url_gcc-c++ = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g++-$(version_gcc).tar.gz
+url_gcc-g77 = http://mirrors.kernel.org/gnu/gcc/gcc-$(version_gcc)/gcc-g77-$(version_gcc).tar.gz
 
-patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch
+patches_gcc = gcc-fixes.patch gcc-fdata-sections-bss.patch gcc-64bitclean.patch gcc-3.3.6-fortran.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"
-
 version_gpc = 20030830
-url_gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).tar.gz
+#url_gpc = http://www.gnu-pascal.de/alpha/gpc-$(version_gpc).tar.gz
+url_gpc = http://www.megacz.com/upstream/gpc-$(version_gpc).tar.gz
 patches_gpc = $(patches_gcc) gpc-with-3.3.3.patch gpc-noutils.patch
 configure_gpc = $(configure_gcc) --enable-languages="pascal"
 
@@ -22,14 +22,20 @@ 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 newlib-nomemcpy.patch newlib-unix.patch
+url_newlib = ftp://sources.redhat.com/pub/newlib/newlib-$(version_newlib).tar.gz
+patches_newlib = newlib-mips.patch newlib-tzset.patch newlib-malloc.patch newlib-nomemcpy.patch newlib-unix.patch newlib-unistd.patch
 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
+url_regex = http://arglist.com/regex/regex3.8a.tar.gz
 
 url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f
+version_zlib = 1.2.3
+url_zlib = http://www.zlib.net/zlib-$(version_zlib).tar.gz
+
+version_expat = 2.0.0
+url_expat = http://umn.dl.sourceforge.net/sourceforge/expat/expat-$(version_expat).tar.gz
+configure_expat = --host= --target=mips-unknown-elf
 
 version_gmp = 4.1.4
 url_gmp = ftp://ftp.gnu.org/gnu/gmp/gmp-$(version_gmp).tar.gz
@@ -59,7 +65,7 @@ cross_root := $(usr)/mips-unknown-elf
 tasks/download_%:
 	if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi
 	mkdir -p download
-	cd download && wget --passive-ftp -N $(url_$*)
+	cd download && curl -O $(url_$*)
 	touch $@
 
 tasks/extract_%: tasks/download_%
@@ -95,19 +101,20 @@ tasks/build_darcs_%: tasks/extract_darcs_%
 	cd "build/$*" && $(MAKE)
 	touch $@
 
+# Add extra nestedvm specific headers to include
 tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib
-	# Add extra nestedvm specific headers to include
+
 	cd $(cross_root)/include && sh $<
 	touch $@
 
 top_lev_stuff := $(patsubst %,../build/org/ibex/nestedvm/%.o, crt0 support support_aux)
 
+# HACK: Get the top level makefile to build the support stuff
 $(top_lev_stuff):
-	# HACK: Get the top level makefile to build the support stuff
 	$(MAKE) -C .. $(top_lev_stuff:../%=%)
 
+# Add our support stuff to libc
 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 $(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
@@ -155,6 +162,14 @@ tasks/build_%: tasks/patch_%
 		$(MAKE) install
 	touch $@
 
+tasks/build_zlib: tasks/patch_zlib
+	mkdir -p $(usr)
+	cd build/zlib-$(version_zlib) && \
+		AR="mips-unknown-elf-ar rc" CC=mips-unknown-elf-gcc ./configure --prefix=$(usr) $(configure_$*) && \
+		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
+		$(MAKE) install
+	touch $@
+
 tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 	mkdir -p $(usr)
 	mkdir -p build/gcc-obj && cd build/gcc-obj && \
@@ -177,15 +192,15 @@ tasks/extract_gpc: tasks/download_gcc tasks/download_gpc
 
 tasks/build_gpc: tasks/patch_gpc tasks/build_libc
 	mkdir -p $(usr)
-	# We need to preapply this patch because gpc's configury doesn't like 3.3.3
+	 # We need to preapply this patch because gpc's configury doesn't like 3.3.3
 	cd build/gpc-$(version_gpc) && cat gcc/version.c | grep -q GPC || $(PATCH) -p0 < gcc/p/diffs/gcc-3.3.diff
-	
-	# echo | is to dismiss the gcc version warning
+
+	 # echo | is to dismiss the gcc version warning
 	mkdir -p build/gpc-obj && cd build/gpc-obj && \
 		echo | ../gpc-$(version_gpc)/configure --prefix=$(usr) $(configure_gpc) && \
 		$(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
 		cd gcc && $(MAKE) pascal.install
-	
+
 	touch $@
 
 tasks/build_openbsdglob: tasks/download_openbsdglob tasks/build_newlib
@@ -203,8 +218,8 @@ tasks/build_openbsdglob: tasks/download_openbsdglob tasks/build_newlib
 tasks/build_regex: tasks/download_regex tasks/build_newlib
 	@mkdir -p $(usr)/mips-unknown-elf/{include,lib}
 	mkdir -p build/regex build/regex/fake
-	cd build/regex && \
-		sh ../../download/regex.shar && \
+	cd build && \
+		tar xvzf ../download/regex3.8a.tar.gz && cd regex && \
 		make CC=mips-unknown-elf-gcc CFLAGS="-I. $(MIPS_CFLAGS)" regcomp.o regexec.o regerror.o regfree.o && \
 		mips-unknown-elf-ar cr libregex.a regcomp.o regexec.o regerror.o regfree.o && \
 		mips-unknown-elf-ranlib libregex.a && \
@@ -328,9 +343,7 @@ tasks/build_busybox: tasks/patch_busybox tasks/build_libc
 
 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 
+	cd build/tex && curl -o tex.web http://www.math.uni.wroc.pl/~hebisch/tex_p/tex.web
 	touch $@
 
 tasks/build_tex_tangle: tasks/extract_tex_tangle tasks/build_gpc
@@ -340,10 +353,10 @@ tasks/build_tex_tangle: tasks/extract_tex_tangle tasks/build_gpc
 
 tasks/build_tex: tasks/build_tex_tangle tasks/build_gpc tasks/download_texinputs
 	@mkdir -p build/tex
-	
-	# HACK: Build Tangel.class
+
+	 # 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 && \