switch to gcc 3.3.0, add gpc and g77 fortran

[nestedvm.git] / upstream / Makefile

diff --git a/upstream/Makefile b/upstream/Makefile
index 430c2e0..608ab30 100644 (file)
--- 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
@@ -36,23 +39,6 @@ export PATH
 PATCH = $(shell test `uname` = SunOS && echo gpatch || echo patch)
 
 tasks/full_toolchain: tasks/build_binutils tasks/build_gcc_step2 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"
-               
        touch $@
 
 tasks/build_gcc: tasks/build_binutils
@@ -71,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_%
@@ -86,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_%
@@ -104,10 +94,27 @@ 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 && \
-               ../gcc-$(version_gcc)/configure --prefix=$(usr) $(configure_gcc_step2) && \
-               $(MAKE) TARGET_CFLAGS="$(MIPS_CFLAGS)" && \
+               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 $@