way better
[org.ibex.core.git] / Makefile
index cb554f0..b376eba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@
 # The Ibex Makefile
 #
 
+#  auto directory creation with %/%: %?
+
 target_Darwin := powerpc-apple-darwin
 target_Win32  := i686-pc-mingw32
 target_Solaris := sparc-sun-solaris2.7
@@ -17,9 +19,9 @@ dist-clean:
        find upstream -name config.cache -exec rm {} \;
        test -e upstream/mips && make -C upstream/mips clean
 
-libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
-libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
-libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libwraster.a
+#libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
+#libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
+#libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libwraster.a
 
 libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/
 libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a
@@ -62,7 +64,7 @@ gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
 gcj: .install_gcc-3.3_$(target)
-       make compile
+#      make compile
        make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
 
 include Makefile.upstream
@@ -140,13 +142,13 @@ compile: .jikes .install_mips2java
        @make -s $(java_sources:build/java/%.java=build/class/%.class)
 .compile: compile
 
-#.compile: $(java_sources) .jikes .install_mips2java
-#      @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
-#      @rm -f $(java_sources:build/java/%.java=build/class/%.class)
-#      mkdir -p build/class
-#      cd build/java; for A in `find . -name \*.java`; do mkdir -p ../class/`dirname $$A`; done
-#      @./.jikes -Xlint:deprecation $(java_sources)
-#      touch .compile
+.compile: $(java_sources) .jikes .install_mips2java
+       @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
+       @rm -f $(java_sources:build/java/%.java=build/class/%.class)
+       mkdir -p build/class
+       cd build/java; for A in `find . -name \*.java`; do mkdir -p ../class/`dirname $$A`; done
+       @./.jikes $(java_sources)
+       touch .compile
 
 build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class
        @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/ibex.jar\033[0m"
@@ -178,7 +180,7 @@ build/$(platform)/org/ibex/plat/AWT.java.o:   ; touch .empty.c; mkdir -p $(@D);
 build/$(platform)/%.java.o: build/class/%.class
        @echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
        mkdir -p `dirname $@`
-       $(gcj) -fCLASSPATH=build/class -c $< -o $@
+       $(gcj) -fCLASSPATH=build/pruned -c $< -o $@
 
 # FIXME detect subclasses of X11
 build/$(platform)/org/ibex/plat/Linux.cc.o: .install_WindowMaker-0.80.2_$(target) 
@@ -201,9 +203,34 @@ build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
 
 # note: binaries appear in a different order in the dependency line vs the link line
-build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o
+build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a 
        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
-       make $(java_sources)
+
+       rm -rf build/$(platform)/*
+       make build/$(platform)/org/ibex/plat/$(platform).cc.o
+       make build/$(platform)/builtin.o
+
+       cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
+                       (find . -name nat\*.o | grep -v JIS;              \
+                       echo boehm.o;\
+                       echo defineclass.o;\
+                       echo exception.o;\
+                       echo posix-threads.o;\
+                       echo posix.o;\
+                       echo prims.o;\
+                       echo jni.o;\
+                       echo resolve.o;\
+                       echo libltdl/ltdl.o;\
+                       find java gnu -name \*.o -not -name '*[A-Z]*';         \
+                       ) > $(shell pwd)/.natbins
+
+
+       cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;\
+       (cat $(shell pwd)/.natbins; echo $(shell pwd)/build/$(platform)/org/ibex/plat/$(platform).cc.o) |\
+               grep -v shs | grep -v SHS |xargs nm |\
+               grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \
+               > $(shell pwd)/.natcalls
+
        rm -rf build/pruned; mkdir -p build/pruned
        javac -classpath lib/bcel-5.1.jar:build/class -d build/class src/org/ibex/util/BytecodePruner.java
        rm -f build/$(platform)/ibex.jar
@@ -215,43 +242,79 @@ build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a buil
                        org/ibex/plat/GCJ*.class \
                        org/ibex/plat/POSIX*.class
        java -cp lib/bcel-5.1.jar:build/class org.ibex.util.BytecodePruner \
-               build/$(platform)/ibex.jar:upstream/install/share/java/libgcj-3.3.jar -o build/pruned
-#      rm -rf out/java/awt
-#      rm -f out/java/lang/*.*
-#      rm -f out/java/lang/reflect/*
-#      mkdir -p out/java/lang/ref
-#      mkdir -p out/java/lang/reflect
-#      cp upstream/gcc-3.3/src/libjava/java/lang/*.java out/java/lang/
-#      cp upstream/gcc-3.3/src/libjava/java/lang/ref/*.java out/java/lang/ref/
-#      cp upstream/gcc-3.3/src/libjava/java/lang/reflect/*.java out/java/lang/reflect/
-       rm -rf build/pruned/org/ibex/js/*; cp build/java/org/ibex/js/* build/pruned/org/ibex/js/
-       rm build/pruned/java/lang/System.class
+               build/$(platform)/ibex.jar:upstream/install/share/java/libgcj-3.3.jar \
+               -o build/pruned \
+               `cat .natcalls`
+
+       rm build/pruned/org/ibex/plat/GCJ*.class
+       cp build/java/org/ibex/plat/GCJ.java build/pruned/org/ibex/plat/
+       cp upstream/gcc-3.3/build-$(target)/$(target)/libjava/java/lang/Object.class build/pruned/java/lang/
+
+       rm -f build/pruned/java/lang/System*.*
        cp upstream/gcc-3.3/src/libjava/java/lang/System.java build/pruned/java/lang/
-       cd build/pruned;                                               \
-               for A in `find . -name \*.class -or -name \*.java`; do \
-                       echo compiling $$A....;                        \
-                       ../../upstream/install/bin/$(target)-gcj -w -c -fCLASSPATH=../../build/class $$A &&                     \
+
+       cd build/pruned;                                                  \
+               for A in `find gnu/gcj java/lang java/net -name \*.class -or -name \*.java`; do    \
+                       echo compiling $$A....;                           \
+                       ../../upstream/install/bin/$(target)-gcj          \
+                               -w -c -Os \
+                               -fCLASSPATH=../../build/$(platform)/ibex.jar \
+                               -fassume-compiled          \
+                               $$A &&                     \
                                (mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \
                done
+
+       cd build/pruned; rm -rf gnu/gcj java/lang java/net
+       cd build/pruned;                                                  \
+               for A in `find . -name \*.class -or -name \*.java`; do    \
+                       echo compiling $$A....;                           \
+                       ../../upstream/install/bin/$(target)-gcj          \
+                               -w -c -Os \
+                               -fassume-compiled          \
+                               -ffunction-sections \
+                               -fdata-sections \
+                               -fomit-frame-pointer \
+                               -fno-force-mem \
+                               -fno-force-addr \
+                               -fmerge-all-constants \
+                               -fCLASSPATH=../../build/$(platform)/ibex.jar \
+                               $$A &&                     \
+                               (mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \
+               done
+#                              -fnew-ra \
+
        rm -f build/$(platform)/ibex.a
+
        cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
                $(shell pwd)/upstream/install/$(target)/bin/ar cq        \
                        $(shell pwd)/build/$(platform)/ibex.a            \
-                       `find . -name nat\*.o`                           \
-                       `find . -name \*.o -not -name '*[A-Z]*'`         \
-                       $(shell pwd)/build/$(platform)/org/ibex/plat/$(platform).cc.o \
                        `find $(shell pwd)/build/$(platform) -name \*.o`
-       PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj \
-               --main=org.ibex.plat.$(platform)                            \
-               -Lupstream/install/$(target)/lib                            \
-               -Lupstream/install/lib                                      \
-               build/$(platform)/ibex.a                                    \
-               upstream/jpeg-6b/build-$(target)/libjpeg.a                  \
-               $(link_flags)                                               \
+
+       rm -f build/$(platform)/natibex.a
+       cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
+               $(shell pwd)/upstream/install/$(target)/bin/ar cq        \
+                       $(shell pwd)/build/$(platform)/natibex.a         \
+                       `cat $(shell pwd)/.natbins`
+       PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj          \
+               -Wl,-O2,--relax,--gc-sections,--noinhibit-exec                       \
+               --main=org.ibex.plat.$(platform)                                     \
+               -Dfile.encoding=UTF8                                                 \
+               -Lupstream/install/$(target)/lib                                     \
+               -Lupstream/install/lib                                               \
+               -Os -w                                                               \
+               -Wl,--whole-archive                                                  \
+               build/$(platform)/ibex.a                                             \
+               -Wl,--no-whole-archive,--gc-sections                                 \
+               build/$(platform)/natibex.a                                          \
+               upstream/jpeg-6b/build-$(target)/libjpeg.a                           \
+               $(link_flags)                                                        \
                upstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/.libs/libgcjgc.a \
-               -lz -ldl -lffi                                                   \
+               -lz -ldl                                                             \
                -o $@
-
+#      strip build/Linux/ibex.linux
+#      ls -l build/Linux/ibex.linux
+#      upx-ucl-beta --best build/Linux/ibex.linux
+#      ls -l build/Linux/ibex.linux
 
 
 ### Builtin Resources ##############################################################################
@@ -264,7 +327,8 @@ build/res/fonts/vera: .download_vera-1.10
        cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
 build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
        @echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
-       cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
+       cd build/res; $(jar) cf builtin.jar org/ibex/builtin/scar.png
+#      cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
 build/$(platform)/builtin.o: build/res/builtin.jar
        @echo -e "\n\033[1mwrapping            .jar -> .o: resources.o\033[0m"
        @(echo "unsigned int builtin_length = ";                                \