X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5fb91ffe699b348a43b4d0f31b7d8c0656a56315;hb=c8f04834582049dce7f80507a1b2b6c6210d5c3f;hp=f84ab6155f595aac87a10f8d5c4faaa6ab8bf39b;hpb=0f015aed3b9062a628fb55c673755dfba82e5c61;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index f84ab61..5fb91ff 100644
--- a/Makefile
+++ b/Makefile
@@ -286,7 +286,12 @@ 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          \
@@ -296,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 \