X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7162106026cb41cbb6812cfdc1b82bb5d41dcb59;hb=809f99d7ff5f73c97cf7b65ff946ef557f8339eb;hp=ca9a76984adf1f1ff13ccca66f5a2210a5cb0b9d;hpb=aebf24e2408d92d1143a09c42258bb38a448b2ec;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index ca9a769..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
 
 
 ##############################################################################
@@ -218,12 +218,10 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
 	mkdir -p build/mips build/res
 	upstream/install/bin/mips-unknown-elf-gcc \
-		-nostdlib \
 		--static \
 		-march=mips1 \
 		-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 $@ \