From 809f99d7ff5f73c97cf7b65ff946ef557f8339eb Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:44:39 +0000 Subject: [PATCH] 2004/01/17 06:46:41 darcs-hash:20040130074439-2ba56-70f8f32faa3526777fb34b102de2a72e90cf1abc.gz --- Makefile | 8 ++++---- Makefile.upstream | 30 ++++++++++++++---------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index d9aed02..7162106 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ dist-clean: JVM: build/JVM/xwt.jar Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext" -Solaris: ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext" +Solaris: ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext -static-libgcc -lpthread" Win32: ; make gcj platform=Win32 target=i686-pc-mingw32 link_flags="-Wl,--subsystem,console -lcomdlg32" target_bin=xwt.exe Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)" @@ -114,9 +114,9 @@ build/h/%.h: build/class/%.class build/$(platform)/org/xwt/plat/Java2.java.o: touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@; build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class - @echo -e "\n\033[1mcompiling .java -> .o: $<\033[0m" + @echo -e "\n\033[1mcompiling .class -> .o: $<\033[0m" mkdir -p `dirname $@` - $(gcj) -c $< -o $@ + $(gcj) -Os -c $< -o $@ build/$(platform)/org/xwt/plat/AWT.java.o: touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@; build/$(platform)/%.java.o: build/java/%.java @@ -156,7 +156,7 @@ build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) - PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags) + PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags) upstream/install/$(target)/lib/libgcj.a ############################################################################## diff --git a/Makefile.upstream b/Makefile.upstream index 6b2ca61..3425855 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -7,7 +7,6 @@ setcc := $(shell test `uname` = Darwin && echo "CC=\"/usr/bin/gcc3 -no-cpp-precomp\"") # 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_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 @@ -58,24 +57,19 @@ endif # building gcc requires binutils .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_$(target) - # how to configure it -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 ifneq ($(shell uname),$(platform)) configure_gcc-3.3 += --with-headers=$(shell pwd)/upstream/install/$(target)/include endif +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 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj -configure_gcc-3.3 += --enable-shared +configure_gcc-3.3 += --disable-shared --enable-static 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" +configure_gcc-3.3_sparc-sun-solaris2.7 += --enable-threads=posix --disable-hash-synchronization --disable-multilib # libjpeg's configury doesn't obey --target environment_jpeg-6b_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH @@ -90,7 +84,6 @@ environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$( 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 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target) @@ -114,9 +107,17 @@ endif @echo -e "\n\033[1mdownloading $*...\033[0m" mkdir -p upstream/$* curl $(url_$*) | tar xzf - -C upstream/$* +ifeq ($(target),powerpc-apple-darwin) + mv upstream/$*/$* upstream/$*/src-darwin; true + mv upstream/$*/libmspack upstream/$*/src-darwin; true + (test -e upstream/$*/patches && cd upstream/$*/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true + (test -e upstream/$*/patches-darwin && cd upstream/$*/src-darwin && for A in ../patches/*.patch; do patch -p0 -l < $$A; done); true +endif +ifneq ($(target),powerpc-apple-darwin) 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 +endif touch $@ .configure_%_$(target): .download_% @@ -130,7 +131,7 @@ 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_$(target) mkdir -p upstream/libmspack-20030726/build-$(target) cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* . touch $@ @@ -146,9 +147,6 @@ endif .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 $@ -- 1.7.10.4