X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;fp=Makefile;h=3fe690fec36bc3b4036b6e5a249cb6cd2dd23cc0;hp=d0b75da5ef4b542077960aa60e88f746b30a0819;hb=b3193eb9454ece679467cce509aad071f1916577;hpb=aeaccb569f1aefd13370d0643b2f4b4dfe2f007d

diff --git a/Makefile b/Makefile
index d0b75da..3fe690f 100644
--- a/Makefile
+++ b/Makefile
@@ -107,8 +107,6 @@ java_sources              += build/java/org/xwt/mips/util/SeekableByteArray.java
 java_sources              += build/java/org/xwt/mips/util/SeekableData.java
 java_sources              += build/java/org/xwt/mips/util/SeekableFile.java
 java_sources              += build/java/org/xwt/mips/util/SeekableInputStream.java
-java_sources              += build/java/org/xwt/mips/ClassFileCompiler.java
-java_sources              += build/java/org/xwt/mips/ELF.java
 java_sources              += build/java/org/xwt/mips/Registers.java
 java_sources              += build/java/org/xwt/mips/Runtime.java
 java_sources              += build/java/org/xwt/mips/UsermodeConstants.java
@@ -249,13 +247,20 @@ build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).
 bcel_jar := upstream/bcel-5.1/src/bcel-5.1.jar
 build/$(platform)/ibex.pruned.jar: .compile $(java_classes) .install_jpeg-6b_$(target) build/$(platform)/builtin.o build/$(platform)/org/ibex/plat/$(platform).cc.o
 	@echo -e "\n\033[1mpruning              .jar -> .jar\033[0m"
+ifneq ($(platform),Darwin)
 	cp upstream/install/share/java/libgcj-3.3.jar build/$(platform)/ibex.jar
 	cd build/class; jar uf ../$(platform)/ibex.jar $(java_classes:build/class/%.class=%*.class)
-	(nm $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\
+	($(nm) $(nat_libjava_files) build/$(platform)/org/ibex/plat/$(platform).cc.o; echo org.ibex.plat.$(platform).main) |\
 		grep _ZN | c++filt --format java | grep " U " | sed 's_ * U __' | sed 's_(.*__' \
 		| java -cp $(bcel_jar):build/class org.ibex.util.NanoGoat build/$(platform)/ibex.jar | tee nanogoat.log
 	mkdir tmp; cd tmp; fastjar xvf ../build/$(platform)/ibex.jar.pruned; rm gnu/gcj/runtime/FirstThread*; cp ../build/class/org/ibex/plat/GCJ* org/ibex/plat/; cp -r ../build/class/org/xwt/mips/* org/xwt/mips/; mkdir -p $(shell pwd)/build/$(platform)/java/lang; mv java/lang/Class.class $(shell pwd)/build/$(platform)/java/lang; fastjar cvf ../build/$(platform)/ibex.jar.pruned .; cd ..; rm -rf tmp
 	mv build/$(platform)/ibex.jar.pruned $@
+endif
+ifeq ($(platform),Darwin)
+	cd build/class; jar cf ../$(platform)/ibex.pruned.jar \
+					org/ibex/plat/Platform*.class \
+					$(filter-out org/ibex/util/NanoGoat%,$(java_classes:build/class/%.class=%*.class))
+endif
 
 ifeq ($(platform),Win32)
 filedes := $(shell pwd)/upstream/gcc-3.3/src/libjava/java/io/natFileWin32.cc
@@ -269,6 +274,7 @@ ifneq ($(target_bin_extension),jar)
 build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/plat/*.cc build/$(platform)/builtin.o $(java_headers)
 
 	@echo -e "\n\033[1mlinking              .jar -> $(target_bin).phat\033[0m"
+ifneq ($(platform),Darwin)
 # -Os
 	cd build/$(platform); $(shell pwd)/upstream/install/bin/$(target)-gcj        \
 		-fCLASSPATH=$(shell pwd)/upstream/install/share/java/libgcj-3.3.jar  \
@@ -277,9 +283,9 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/
 		-c java/lang/Class.class
 	cd upstream/gcc-3.3/src/libjava/java/lang;\
 		ln -sf ../../../../build-$(target)/$(target)/libjava/java/lang/natConcreteProcess.cc
+endif
 # we need -fno-store-check since we can't dynamically resolve references to array classes
 	PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj              \
-		-Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive        \
 		--main=org.ibex.plat.$(platform)                                         \
 		-Dfile.encoding=UTF8                                                     \
 		-DPREFIX=\"\"                                                            \
@@ -302,15 +308,23 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/
 		-Ufile \
 		build/$(platform)/ibex.pruned.jar                                        \
 		src/org/ibex/plat/$(platform).cc                                         \
-		$(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*) \
-		$(filedes) \
 		build/$(platform)/builtin.o                                              \
 		upstream/jpeg-6b/build-$(target)/libjpeg.a                               \
 		$(link_flags)                                                            \
 		$(libjava_dir)/../boehm-gc/.libs/libgcjgc.a                              \
+ifneq ($(platform),Darwin)
+		$(nat_libjava_files_:%.o=$(shell pwd)/upstream/gcc-3.3/src/libjava/%.c*) \
+		$(filedes)                                                               \
 		build/$(platform)/Class.o                                                \
-		$(libjava_dir)/gnu/gcj/runtime/FirstThread.o \
-		-lz -o $@.phat
+		$(libjava_dir)/gnu/gcj/runtime/FirstThread.o                             \
+                -Wl,-O2,--relax,--gc-sections,--noinhibit-exec,--no-whole-archive        \
+		-lz -o $@.phat \
+else
+		$(libjava_dir)/.libs/libgcj.a						 \
+		-o $@ \
+endif
+
+ifneq ($(platform),Darwin)
 	@echo; ls -l $@.phat
 
 	@echo -e "\n\033[1mstripping              $(target_bin).phat -> $(target_bin)\033[0m"
@@ -321,6 +335,7 @@ build/$(platform)/$(target_bin): build/$(platform)/ibex.pruned.jar src/org/ibex/
 	upx-ucl-beta $@
 	@echo; ls -l $@.phat
 endif
+endif
 
 ### Builtin Resources ##############################################################################
 
@@ -407,5 +422,3 @@ doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/util/Doc.cla
 	cd $(@D); java -cp ../../build/class org.ibex.util.Doc slides < `basename $*`.xml > `basename $*`.tex
 	cd $(@D); pdflatex `basename $*`.tex
 	open doc/$*.pdf
-
-