X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=c0eee65527dd2f24dd076e2a047d0cce13444e07;hp=57074b0da9edddea12cffc7ee55762311a26afbb;hb=e49a5ccd0391ce6827e5d90858719c13e25b9e82;hpb=7a9bc0ba0fd215bd5b9a2e370937d81870aadba5

diff --git a/Makefile b/Makefile
index 57074b0..c0eee65 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ MIPS_PC = mips-unknown-elf-gpc
 
 # Be VERY careful about changing any of these as they can break binary 
 # compatibility and create hard to find bugs
-mips_optflags = -O3 -g \
+mips_optflags = -O3 \
 	-mmemcpy \
 	-ffunction-sections -fdata-sections \
 	-falign-functions=512 \
@@ -76,7 +76,7 @@ export PATH
 #
 # General Build Stuff
 #
-all: $(java_classes) $(mips_objects)
+all: $(java_classes) $(tasks)/build_libc
 ifdef NATIVE_MIPS2JAVA_COMPILER
 all: build/mips2java$(EXE_EXT) $(mips_objects)
 endif
@@ -132,7 +132,7 @@ build/%.o: src/%.s $(tasks)/build_gcc
 	@mkdir -p `dirname $@`
 	$(MIPS_CC) -x assembler-with-cpp -c -o $@ $<
 
-tmp/%.s: %.c $(tasks)/build_gcc
+tmp/%.s: src/%.c $(tasks)/build_gcc
 	@mkdir -p `dirname $@`
 	$(MIPS_CC) $(MIPS_CFLAGS) $($(notdir $*)_CFLAGS) -c -S -o $@ $<
 
@@ -230,7 +230,8 @@ compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcc
 		org.ibex.nestedvm.RuntimeCompiler.main 'org.ibex.nestedvm.Runtime.decodeData' \
 		'org.ibex.nestedvm.UnixRuntime.<init>' 'org.ibex.nestedvm.Runtime.initPages' \
 		'org.ibex.nestedvm.Runtime.clearPages' 'org.ibex.nestedvm.Runtime.syscall' \
-		'org.ibex.nestedvm.Runtime$$CPUState.dup'
+		'org.ibex.nestedvm.Runtime$$CPUState.dup' \
+		org.ibex.nestedvm.util.Platform\$$Jdk{11,12,13,14}.'<init>'
 	cd tmp/pruned && jar cfm ../../$@ ../../.manifest .
 
 sizecheck: compact_runtime_compiler.jar
@@ -246,7 +247,7 @@ rebuild-constants: $(tasks)/build_libc
 	( \
 		cat \
 			src/org/ibex/nestedvm/syscalls.h \
-			$(usr)/mips-uknown-elf/include/nestedvm/sockets.h \
+			$(usr)/mips-unknown-elf/include/nestedvm/socket.h \
 			$(usr)/mips-unknown-elf/include/sys/{errno.h,unistd.h,syslimits.h,sysctl.h}; \
 		$(MIPS_CC) -E -dM $(usr)/mips-unknown-elf/include/sys/fcntl.h | awk '$$2 ~ /^[OF]_/ { print; }'; \
 	) | ( \