From: megacz Date: Fri, 30 Jan 2004 07:44:33 +0000 (+0000) Subject: 2004/01/16 09:36:05 X-Git-Tag: RC3~166 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=aebf24e2408d92d1143a09c42258bb38a448b2ec 2004/01/16 09:36:05 darcs-hash:20040130074433-2ba56-d038134dd59d5fb15a6671883ad58c7c093d00d3.gz --- diff --git a/Makefile b/Makefile index 575cbb1..ca9a769 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar # compile is here to force compilation of the .class files (they get used via -Ibuild) without # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes) -gcj: .vendor .compile .install_gcc-3.3.2_$(target) $(target_bin) +gcj: .vendor .compile .install_gcc-3.3_$(target) $(target_bin) build/JVM/xwt.jar: .compile build/res/builtin.jar @echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m" @@ -212,7 +212,7 @@ build/mips/%.c.o: src/%.c .download_libmspack-20030726 -Iupstream/libmspack-20030726/src/mspack \ -c -o $@ $< -build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o +build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf @echo -e "\n\033[1mlinking .o -> .mips: $@\033[0m" @@ -221,10 +221,11 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips -nostdlib \ --static \ -march=mips1 \ - -T src/org/xwt/mips/linker.ld \ - -Lbuild/mips \ - -Lupstream/freetype-2.1.4/src/objs \ - -Lupstream//libmspack-20030726/build-mips-unknown-elf/ \ + -T upstream/mips/org/xwt/mips/linker.ld \ + -L upstream/mips/build/org/xwt/mips/ \ + -L upstream/mips/build/ \ + -L upstream/freetype-2.1.4/src/objs \ + -L upstream/libmspack-20030726/build-mips-unknown-elf/ \ -o $@ \ $^ \ -lfreetype \ diff --git a/Makefile.upstream b/Makefile.upstream index bf13f5f..82fcb38 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -8,17 +8,17 @@ setcc := $(shell test `uname` = Darwin && echo "CC=\"/usr/bin/gcc3 -no-cpp-preco # where to get stuff url_newlib-1.11.0 := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz -url_binutils-2.14 := ftp://ftp.gnu.org/gnu/binutils/binutils-2.14.tar.gz +url_binutils-2.13.2.1 := ftp://ftp.gnu.org/gnu/binutils/binutils-2.13.2.1.tar.gz url_w32api-2.3 := http://umn.dl.sourceforge.net/sourceforge/mingw/w32api-2.3.tar.gz url_mingw-runtime-3.0 := http://umn.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.0.tar.gz url_freetype-2.1.4 := http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz -url_gcc-3.3.2 := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3.2/gcc-3.3.2.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://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.14_powerpc-apple-darwin: .vendor +.install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src cd upstream/darwin-linker; tar xvzf ../install/powerpc-apple-darwin/cctools-478.tgz ifneq ($(shell uname),Darwin) @@ -56,34 +56,22 @@ endif touch $@ # building gcc requires binutils -.configure_gcc-3.3.2_$(target): .install_binutils-2.14_$(target) +.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target) # building newlib requires gcc -.configure_newlib-1.11.0_$(target): .install_gcc-3.3.2_$(target) +.configure_newlib-1.11.0_$(target): .install_gcc-3.3_$(target) # how to configure it -configure_gcc-3.3.2 += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi -ifneq ($(platform),Solaris) -configure_gcc-3.3.2 += --disable-shared -else -configure_gcc-3.3.2 += --enable-shared -endif -configure_gcc-3.3.2 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj -ifneq ($(shell uname),$(platform)) -ifneq ($(target),mips-unknown-elf) -configure_gcc-3.3.2 += --with-ld=$(shell pwd)/upstream/install/bin/$(target)-ld --with-gnu-ld -configure_gcc-3.3.2 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as --with-gnu-as -configure_gcc-3.3.2 += --with-headers=$(shell pwd)/upstream/install/$(target)/include -configure_gcc-3.3.2 += --with-libs=$(shell pwd)/upstream/install/$(target)/lib -endif -endif -configure_gcc-3.3.2_powerpc-apple-darwin += --enable-threads=posix --disable-hash-synchronization --disable-multilib -configure_gcc-3.3.2_i686-pc-mingw32 += --enable-threads=win32 --enable-hash-synchronization -configure_gcc-3.3.2_i686-pc-linux-gnu += --enable-threads=posix --enable-hash-synchronization -configure_gcc-3.3.2_sparc-sun-solaris2.7 += --enable-threads=posix --disable-multilib -configure_gcc-3.3.2_mips-unknown-elf += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld -configure_gcc-3.3.2_mips-unknown-elf += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as -configure_gcc-3.3.2_mips-unknown-elf += --enable-languages=c --nfp --enable-multilib --disable-threads +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 +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 --enable-hash-synchronization --disable-multilib environment_newlib-1.11.0_mips-unknown-elf += TARGET_CFLAGS="-O3 -ffunction-sections -fdata-sections" @@ -140,12 +128,29 @@ endif $(configure_$*_$(target)) touch $@ -.configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3.2_$(target) .install_newlib-1.11.0_$(target) +.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 ../src/mspack/* . touch $@ -.install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3.2_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 \