2003/12/31 23:42:51

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 670e934..03a1fb8 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -14,7 +14,7 @@ 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
 
@@ -84,6 +84,8 @@ configure_gcc-3.3_mips-unknown-elf      += --with-gnu-ld=$(shell pwd)/upstream/i
 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
 
+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
 environment_jpeg-6b_$(target)           += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
@@ -95,6 +97,8 @@ environment_libmspack-20030726_$(target) += PATH=$(shell pwd)/upstream/install/$
 environment_libmspack-20030726_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
 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
 
@@ -120,6 +124,7 @@ endif
        mkdir -p upstream/$*
        curl $(url_$*) | tar xzf - -C upstream/$*
        mv upstream/$*/$* upstream/$*/src; 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 $@
 
@@ -136,14 +141,16 @@ endif
 
 .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/* .
-       touch $@
-
-.install_libmspack-20030726_$(target): .configure_libmspack-20030726_$(target)
+       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
+       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 $@
 
@@ -155,6 +162,8 @@ endif
                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); \
@@ -167,8 +176,8 @@ endif
 .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
@@ -177,8 +186,8 @@ endif
        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