better

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index bb603af..5fb91ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -248,14 +248,11 @@ build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a
 
        rm build/pruned/org/ibex/plat/GCJ*.class
        cp build/java/org/ibex/plat/GCJ.java build/pruned/org/ibex/plat/
-
-       rm -rf build/Linux/java
-       rm -rf build/Linux/gnu/gcj
-       rm -rf build/Linux/gnu/java
-       rm -rf build/Linux/gnu/classpath
-
        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/
+
 #                              -fnew-ra \
 #                              -ffunction-sections \
 #                              -fdata-sections \
@@ -284,15 +281,17 @@ build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a
                                (mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \
                done
 
-#      rm -rf build/Linux/java/security build/Linux/gnu/java/security build/Linux/java/util/jar build/Linux/java/io/Object*
-#      rm -rf build/pruned/java/security build/pruned/gnu/java/security build/pruned/java/util/jar build/pruned/java/io/Object*
-
        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 $(shell pwd)/build/$(platform) -name \*.o` \
+                       `find $(shell pwd)/build/$(platform) -name \*.o`
+
+       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`
 # --relax,-O2,--no-whole-archive,
        PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj          \
@@ -302,7 +301,10 @@ build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a
                -Lupstream/install/$(target)/lib                                     \
                -Lupstream/install/lib                                               \
                -Os -w                                                               \
+               -Wl,--whole-archive                                                  \
                build/$(platform)/ibex.a                                             \
+               -Wl,--no-whole-archive                                               \
+               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 \