X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b6055501076419591fab94407a7f93a1b9426ab4;hb=a726bd527e6364dd00477e17e9c688d32509c62c;hp=671af44db84af497fe2b64fc16c2c7f1f39cf2cd;hpb=769cf53f52755d6b8c976edb561e3c21700447aa;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 671af44..b605550 100644
--- a/Makefile
+++ b/Makefile
@@ -19,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
@@ -64,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
@@ -142,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"
@@ -203,13 +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"
-	find upstream/gcc-3.3/build-i686-pc-linux-gnu/i686-pc-linux-gnu/libjava/ \
-		-name nat\*.o -or \( -name \*.o -not -name '*[A-Z]*' \) -exec nm {} \; |\
-		 grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \
-		> .natcalls
-	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
@@ -225,75 +246,62 @@ build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a buil
 		-o build/pruned \
 		`cat .natcalls`
 
-	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
-	cp upstream/gcc-3.3/src/libjava/java/lang/System.java build/pruned/java/lang/
-
-	rm build/pruned/gnu/gcj/runtime/FirstThread*.class
-	cp upstream/gcc-3.3/src/libjava/gnu/gcj/runtime/FirstThread.java build/pruned/gnu/gcj/runtime/
-
 	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/
 
-	find build/pruned/gnu/java/locale/ -name 'LocaleInformation_*' -not -name 'LocaleInformation_en.class' -not -name 'LocaleInformation_en_US.class' -exec rm {} \;
-
-#	cd build/pruned; fastjar cvf ../../tmp.jar .
-#	java -jar lib/jarg.jar -verbose -verboseufm -normlv -normsf -normsy -normin \
-#				-normex -nornc -nornf -nornm -nobco tmp.jar
-#	cd build/pruned; fastjar xvf ../../tmp.jar
+	rm -f build/pruned/java/lang/System*.*
+	cp upstream/gcc-3.3/src/libjava/java/lang/System.java build/pruned/java/lang/
 
-# try oneshot compile/link
-# --redefine-sym to merge errorthrowers?   or do this in C++?
-# --rename-section to try to merge Utf8 sections?
+#				-fnew-ra \
+#				-ffunction-sections \
+#				-fdata-sections \
+#				-fomit-frame-pointer \
+#				-fno-force-mem \
+#				-fno-force-addr \
+#				-fmerge-all-constants \
 
 	cd build/pruned;                                                  \
 		for A in `find . -name \*.class -or -name \*.java`; do    \
 			echo compiling $$A....;                           \
 			../../upstream/install/bin/$(target)-gcj          \
-				-fdata-sections -ffunction-sections -w -c -Os \
-				-fCLASSPATH=../../build/$(platform)/ibex.jar $$A &&                     \
+				-w -c -Os \
+				-fCLASSPATH=../../build/$(platform)/ibex.jar \
+				$$A &&                     \
 				(mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \
 		done
+
 	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            \
-			boehm.o  defineclass.o  exception.o              \
-			posix-threads.o  posix.o  prims.o  resolve.o     \
-			`find . -name nat\*.o | grep -v JIS`             \
-			`find . -name \*.o -not -name '*[A-Z]*'`         \
 			`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                                      \
-		-ffunction-sections -fdata-sections -Os -w -fCLASSPATH=build/$(platform)/ibex.jar \
-		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)                                     \
+		-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 \
-		-lz -ldl -lffi                                                   \
-		-Wl,--noinhibit-exec,--gc-sections \
+		-lz -ldl                                                             \
 		-o $@
-
-# linker
-# --no-whole-archive,--relax,-O,2
-# 
-#				-fomit-frame-pointer \
-#				-fno-force-mem \
-#				-fno-force-addr \
-#				-fno-inline-functions \
-#				-fnew-ra \
-#				-fbranch-probabilities \
-#				-finline-limit=1 \
-#				-fno-schedule-insns \
-#				-fno-optimize-sibling-calls \
-#				-fno-if-conversion \
-#				-fno-thread-jumps \
-#				-fno-hosted \
+#	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 ##############################################################################
@@ -306,7 +314,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 = ";                                \