2004/01/16 10:21:31

[org.ibex.core.git] / Makefile.upstream

diff --git a/Makefile.upstream b/Makefile.upstream
index 03a1fb8..bd1f2f9 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -63,26 +63,17 @@ endif
 
 # how to configure it
 configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
-ifneq ($(platform),Solaris)
-configure_gcc-3.3                       += --disable-shared 
-else
-configure_gcc-3.3                       += --enable-shared 
-endif
-configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
+configure_gcc-3.3                       += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld --with-gnu-ld
+configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as --with-gnu-as
 ifneq ($(shell uname),$(platform))
-ifneq ($(target),mips-unknown-elf)
-configure_gcc-3.3                       += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
-configure_gcc-3.3                       += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
 configure_gcc-3.3                       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 endif
-endif
+configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
+configure_gcc-3.3                       += --enable-shared 
 configure_gcc-3.3_powerpc-apple-darwin  += --enable-threads=posix --disable-hash-synchronization --disable-multilib
 configure_gcc-3.3_i686-pc-mingw32       += --enable-threads=win32 --enable-hash-synchronization
 configure_gcc-3.3_i686-pc-linux-gnu     += --enable-threads=posix --enable-hash-synchronization
-configure_gcc-3.3_sparc-sun-solaris2.7  += --enable-threads=posix --disable-multilib
-configure_gcc-3.3_mips-unknown-elf      += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
-configure_gcc-3.3_mips-unknown-elf      += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
-configure_gcc-3.3_mips-unknown-elf      += --enable-languages=c --nfp --enable-multilib --disable-threads
+configure_gcc-3.3_sparc-sun-solaris2.7  += --enable-threads=posix --enable-hash-synchronization --disable-multilib
 
 environment_newlib-1.11.0_mips-unknown-elf += TARGET_CFLAGS="-O3 -ffunction-sections -fdata-sections"
 
@@ -144,7 +135,24 @@ endif
        cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
        touch $@
 
-.install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4
+.install_mips2java:
+       mkdir -p upstream/install
+       echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass
+       cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips
+       cd upstream/mips/upstream; ln -s `cd ../..; pwd`/install
+       make -C upstream/mips
+       touch $@
+
+.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java
+       touch $@
+
+.install_newlib-1.11.0_mips-unknown-elf: .install_mips2java
+       touch $@
+
+.install_gcc-3.3_mips-unknown-elf: .install_mips2java
+       touch $@
+
+.install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4
        cd upstream/freetype-2.1.4/src; \
           make setup ansi; \
           PATH=$$PATH:`pwd`/../../install/bin make \