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

diff --git a/upstream/Makefile b/upstream/Makefile
index f15c793..608ab30 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -1,11 +1,14 @@
 # Inspired by XWT's Makefile.upstream
 
-version_gcc = 3.3.3
+version_gcc = 3.3
+version_gpc = 20030830
 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++"
+configure_gcc_step2 = $(configure_gcc) --enable-languages="c,c++,pascal,f77"
 
 version_binutils = 2.14
 url_binutils = ftp://ftp.gnu.org/gnu/binutils/binutils-$(version_binutils).tar.gz
@@ -54,7 +57,7 @@ tasks/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-gpc tasks/download_gcc-g77
 	touch $@
 
 tasks/extract_%: tasks/download_%
@@ -69,6 +72,10 @@ 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_%
@@ -106,7 +113,7 @@ tasks/build_gcc_step2: tasks/patch_gcc tasks/build_libc
 		
 	mkdir -p $(usr)
 	mkdir -p build/gcc-obj && cd build/gcc-obj && \
-		../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \
+		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) install
 	touch $@