From 4a3be9eff6a5201f4fd7228fc8413a8bd36ddd7c Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:04:45 +0000 Subject: [PATCH] 2003/09/04 09:52:57 darcs-hash:20040130070445-2ba56-d580e492b8105114abde6c01148f3c44dbe83d6b.gz --- Makefile | 8 ++++---- upstream/Makefile | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 444515b..f5a6522 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ jikes_flags := -verbose -nowarn -sourcepath src/ gcc_path := upstream/install gcc_optimizations := -O2 #gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -ffunction-sections -fdata-sections -gcc_flags := $(gcc_optimizations) -Ibuild/h +gcc_flags := $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ gcj_flags += -fCLASSPATH=build/java gcj := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags) g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags) @@ -58,7 +58,7 @@ upstream/.jikes: make -sC upstream .jikes $(gcc_path)/bin/$(target)-gcj: - make -sC upstream gcc-3.3.1-$(target) + make -sC upstream gcc-3.3-$(target) # PHASE 1b: human-written inputs @@ -75,7 +75,7 @@ java_sources := $(handwritten_java_sources:src/%.java=build/java/%.java) java_sources += $(handwritten_java_pp_sources:src/%.java.pp=build/java/%.java) java_sources += $(handwritten_mips_sources:src/%.mips.c=build/java/%.java) java_sources += build/java/org/xwt/Builtin.java -java_sources += build/java/org/xwt/imp/Freetype.java +#java_sources += build/java/org/xwt/imp/Freetype.java $(handwritten_java_sources:src/%.java=build/java/%.java): build/java/%.java: src/%.java @echo "symlinking: $@" @mkdir -p `dirname $@`; \ @@ -164,7 +164,7 @@ build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/org/ build/mips/freetype.mips: $(freetype_mips_objects) @echo "compiling .c -> .mips: $@" @mkdir -p build/mips - @make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3.1-mips freetype-2.1.4/src .headers target=mips + @make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3-mips freetype-2.1.4/src .headers target=mips @$(gcc_path)/bin/mips-gcc \ --static \ -mabi=32 \ diff --git a/upstream/Makefile b/upstream/Makefile index 9bc68d6..c6e03cf 100644 --- a/upstream/Makefile +++ b/upstream/Makefile @@ -4,7 +4,7 @@ # # upstream packages we need -packages := jikes-1.18 binutils-2.13.2.1 newlib-1.11.0 w32api-2.3 mingw-runtime-3.0 freetype-2.1.4 gcc-3.3.1 jpeg-6b +packages := jikes-1.18 binutils-2.13.2.1 newlib-1.11.0 w32api-2.3 mingw-runtime-3.0 freetype-2.1.4 gcc-3.3 jpeg-6b # where to get stuff url_newlib-1.11.0 := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz @@ -12,19 +12,19 @@ url_binutils-2.13.2.1 := ftp://ftp.gnu.org/gnu/binutils/binutils-2.13.2.1.tar.g 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.1 := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3.1/gcc-3.3.1.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 # how to configure it -configure_gcc-3.3.1 := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi -configure_gcc-3.3.1 += --disable-java-awt --disable-interpreter --enable-static -configure_gcc-3.3.1 += --with-gnu-ld --with-gnu-as -configure_gcc-3.3.1-powerpc-apple := --enable-threads=posix --disable-hash-synchronization -configure_gcc-3.3.1-i686-pc-mingw32 := --enable-threads=win32 --enable-hash-synchronization -configure_gcc-3.3.1-i686-pc-linux-gnu := --enable-threads=posix --enable-hash-synchronization -configure_gcc-3.3.1-sparc-sun-solaris2.7 := --enable-threads=posix --disable-multilib -configure_gcc-3.3.1-mips := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads +configure_gcc-3.3 := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi +configure_gcc-3.3 += --disable-java-awt --disable-interpreter --enable-static +configure_gcc-3.3 += --with-gnu-ld --with-gnu-as --enable-libgcj +configure_gcc-3.3-powerpc-apple := --enable-threads=posix --disable-hash-synchronization +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 := --enable-languages=c --nfp --with-newlib=yes --enable-multilib --disable-threads # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH .jikes: @@ -56,9 +56,9 @@ $(packages): $(packages:%=%-$(target)): %-$(target): % make $