X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b6055501076419591fab94407a7f93a1b9426ab4;hb=a726bd527e6364dd00477e17e9c688d32509c62c;hp=7f3c4dc606a09cc886b3947d396a1b8bf0d785a6;hpb=4c907d5df93e04fceff7dcd3f6ab42f02347fe65;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 7f3c4dc..b605550 100644
--- a/Makefile
+++ b/Makefile
@@ -259,17 +259,7 @@ build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a
 #				-fomit-frame-pointer \
 #				-fno-force-mem \
 #				-fno-force-addr \
-#				-fbranch-probabilities \
-#				-fno-schedule-insns \
-#				-fno-optimize-sibling-calls \
-#				-fno-if-conversion \
-#				-fno-thread-jumps \
-#				-foptimize-static-class-initialization \
-#				-fno-store-check \
-#				-fno-bounds-check \
 #				-fmerge-all-constants \
-#				-fno-inline-functions \
-#				-finline-limit=1 \
 
 	cd build/pruned;                                                  \
 		for A in `find . -name \*.class -or -name \*.java`; do    \
@@ -286,25 +276,27 @@ build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.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          \
-		-Wl,--no-gc-sections,--noinhibit-exec,-rpath,upstream/install/$(target)/lib     \
-		-Wl,-nostdlib,--eh-frame-hdr,-m,elf_i386,-dynamic-linker,/lib/ld-linux.so.2 \
+		-Wl,-O2,--relax,--gc-sections,--noinhibit-exec                       \
 		--main=org.ibex.plat.$(platform)                                     \
 		-Lupstream/install/$(target)/lib                                     \
 		-Lupstream/install/lib                                               \
 		-Os -w                                                               \
-		-Wl,--whole-archive \
+		-Wl,--whole-archive                                                  \
 		build/$(platform)/ibex.a                                             \
-		-Wl,--no-whole-archive \
+		-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 \
-		-lz -ldl -lgcc -lm -lpthread -ldl -lgcc -lc -lgcc \
-		upstream/install/bin/../lib/gcc-lib/i686-pc-linux-gnu/3.3/crtend.o \
-		upstream/install/bin/../lib/gcc-lib/i686-pc-linux-gnu/3.3/../../../../i686-pc-linux-gnu/lib/crtn.o \
+		-lz -ldl                                                             \
 		-o $@
 #	strip build/Linux/ibex.linux
 #	ls -l build/Linux/ibex.linux