X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile.upstream;h=82fcb38e23081dc0f332faf3f9280795dddd1bfd;hp=620411c7e22ac25a45bea6c580f33aee3fedf256;hb=aebf24e2408d92d1143a09c42258bb38a448b2ec;hpb=067fcf0556752492c6396bc01dff0bf266199651

diff --git a/Makefile.upstream b/Makefile.upstream
index 620411c..82fcb38 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -14,8 +14,9 @@ url_mingw-runtime-3.0  := http://umn.dl.sourceforge.net/sourceforge/mingw/mingw-
 url_freetype-2.1.4     := http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz
 url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3/gcc-3.3.tar.gz 
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
-url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.gz
+url_jikes-1.18         := http://dist.xwt.org/jikes-1.18.tgz
 url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz
+url_vera-1.10          := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz
 
 .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor
 	rm -rf upstream/darwin-linker/src
@@ -61,22 +62,18 @@ endif
 .configure_newlib-1.11.0_$(target): .install_gcc-3.3_$(target)
 
 # how to configure it
-configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm
-configure_gcc-3.3                       += --disable-shared --disable-jvmpi
+configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
+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
+configure_gcc-3.3                       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
-ifneq ($(shell uname),$(platform))
-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_powerpc-apple-darwin  += --with-headers=$(shell pwd)/upstream/install/$(target)/include
-endif
+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       += --with-headers=$(shell pwd)/upstream/install/$(target)/include
 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"
 
 # libjpeg's configury doesn't obey --target
 environment_jpeg-6b_$(target)           += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
@@ -87,8 +84,10 @@ environment_jpeg-6b_$(target)           += AR2=$(shell pwd)/upstream/install/$(t
 # libmspack configury doesn't obey --target
 environment_libmspack-20030726_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
 environment_libmspack-20030726_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
-environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar rc"
+environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar"
 environment_libmspack-20030726_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
+environment_libmspack-20030726_$(target) += OPTIM="-ffunction-sections -fdata-sections -O3"
+
 
 environment_gcc_3.3_$(target)           += PATH=$(shell pwd)/upstream/install/bin:$$PATH
 
@@ -103,6 +102,10 @@ vendor: .vendor; @true
 	mkdir -p upstream/install/i686-pc-mingw32
 	curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
 	curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
+ifeq ($(shell uname),Linux)
+	rm -rf upstream/install/i686-pc-linux-gnu/include
+	ln -sf /usr/include upstream/install/i686-pc-linux-gnu/include
+endif
 	touch .vendor
 
 .download_%:
@@ -110,7 +113,8 @@ vendor: .vendor; @true
 	mkdir -p upstream/$*
 	curl $(url_$*) | tar xzf - -C upstream/$*
 	mv upstream/$*/$* upstream/$*/src; true
-	(test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 < $$A; done); true
+	mv upstream/$*/libmspack upstream/$*/src; true
+	(test -e upstream/$*/patches && cd upstream/$*/src && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true
 	touch $@
 
 .configure_%_$(target): .download_% 
@@ -124,22 +128,49 @@ vendor: .vendor; @true
 		$(configure_$*_$(target))
 	touch $@
 
-.install_libmspack-20030726_$(target): .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
-.configure_libmspack-20030726_$(target): .download_libmspack-20030726
+.configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
 	mkdir -p upstream/libmspack-20030726/build-$(target)
-	cd upstream/libmspack-20030726/build-$(target); ln -sf ../libmspack/mspack/* .
+	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
-	cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../../install/bin make CC=mips-unknown-elf-gcc AR=mips-unknown-elf-ar
+.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 \
+	      CC=mips-unknown-elf-gcc \
+	      AR=mips-unknown-elf-ar \
+	      CFLAGS="-c -ffunction-sections -fdata-sections -O3"
 	upstream/install/bin/mips-unknown-elf-ranlib upstream/freetype-2.1.4/src/objs/libfreetype.a
 	touch $@
 
-.install_%_$(target): .configure_%_$(target)
+.build_%_$(target): .configure_%_$(target)
 	@echo -e "\n\033[1mbuilding $*...\033[0m"
 	cd upstream/$*/build-$(target); \
 		$(setcc) PATH=$$PATH:`pwd`/../../install/bin \
 		$(environment_$*_$(target)) \
 		make $(setcc) $(environment_$*_$(target))
+	touch $@
+
+.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true
+
+.install_%_$(target): .build_%_$(target)
 	@echo -e "\n\033[1minstalling $*...\033[0m"
 	cd upstream/$*/build-$(target); \
 		$(setcc) PATH=$$PATH:`pwd`/../../install/bin \
@@ -151,8 +182,8 @@ vendor: .vendor; @true
 .jikes:
 	@echo -e "\n\033[1mdetecting your jikes installation...\033[0m"
 	echo "#!/bin/sh" > .jikes
-	echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
-	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
+	#echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
+	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
 	(type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target=
 	echo -n "$(jikes_flags) -bootclasspath " >> .jikes
 	echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
@@ -161,8 +192,8 @@ vendor: .vendor; @true
 	java -cp . GetBootClassPath >> .jikes
 	rm GetBootClassPath.*
 	echo 'EXIT=$$?' >> .jikes
-	echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
-	echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
+	#echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
+	#echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
 	echo 'exit $$EXIT' >> .jikes
 	mv .jikes .jikes+
 	cp .jikes+ .jikes