2004/01/14 09:46:40

darcs-hash:20040130074431-2ba56-724591c409529c27b6cc649f6a8bcd8e1d53d132.gz

diff --git a/Makefile b/Makefile
index 8ea3360..575cbb1 100644 (file)
--- 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_$(target) $(target_bin)
+gcj: .vendor .compile .install_gcc-3.3.2_$(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"

diff --git a/Makefile.upstream b/Makefile.upstream
index 03a1fb8..bf13f5f 100644 (file)
--- 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.13.2.1  := ftp://ftp.gnu.org/gnu/binutils/binutils-2.13.2.1.tar.gz 
+url_binutils-2.14  := ftp://ftp.gnu.org/gnu/binutils/binutils-2.14.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            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3/gcc-3.3.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_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.13.2.1_powerpc-apple-darwin: .vendor
+.install_binutils-2.14_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,33 +56,34 @@ endif
        touch $@
 
 # building gcc requires binutils
-.configure_gcc-3.3_$(target): .install_binutils-2.13.2.1_$(target)      
+.configure_gcc-3.3.2_$(target): .install_binutils-2.14_$(target)      
 
 # building newlib requires gcc
-.configure_newlib-1.11.0_$(target): .install_gcc-3.3_$(target)
+.configure_newlib-1.11.0_$(target): .install_gcc-3.3.2_$(target)
 
 # how to configure it
-configure_gcc-3.3                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
+configure_gcc-3.3.2                       += --enable-languages=c,c++,java --enable-gc-type=boehm --disable-jvmpi
 ifneq ($(platform),Solaris)
-configure_gcc-3.3                       += --disable-shared 
+configure_gcc-3.3.2                       += --disable-shared
 else
-configure_gcc-3.3                       += --enable-shared 
+configure_gcc-3.3.2                       += --enable-shared 
 endif
-configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj
+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                       += --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
+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_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.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
 
 environment_newlib-1.11.0_mips-unknown-elf += TARGET_CFLAGS="-O3 -ffunction-sections -fdata-sections"
 
@@ -139,12 +140,12 @@ endif
                $(configure_$*_$(target))
        touch $@
 
-.configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3_$(target) .install_newlib-1.11.0_$(target)
+.configure_libmspack-20030726_$(target): .download_libmspack-20030726 .install_gcc-3.3.2_$(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_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4
+.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
        cd upstream/freetype-2.1.4/src; \
           make setup ansi; \
           PATH=$$PATH:`pwd`/../../install/bin make \