yet more conflict resolution

darcs-hash:20040521085604-24bed-779a68004c36b5b1acd8d3da4aac33c1ec1a6695.gz

diff --git a/upstream/Makefile b/upstream/Makefile
index aa22d6a..41d7b1c 100644 (file)
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -4,7 +4,10 @@ version_gcc = 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,10 +81,6 @@ 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
 
@@ -134,6 +133,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_%