X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=e4143dcab3d0e96f4919a21f25f250962d65d3f4;hp=ee8e94117c6c462a61bf1bf520e76a1a88660826;hb=efbc1822d80a8fb04447731bb33d64d3537f8121;hpb=034a42fa65955289442614ef9914e5474fac62aa

diff --git a/Makefile b/Makefile
index ee8e941..e4143dc 100644
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,7 @@ mips_optflags = -O3 -g \
 
 MIPS_CFLAGS = $(mips_optflags) $(flags) -I. -Wall -Wno-unused -Werror
 MIPS_LD = mips-unknown-elf-gcc
-MIPS_LDFLAGS= \
-	$(flags) -L$(build)/org/ibex/nestedvm --static \
-	-T $(mips2java_root)/src/org/ibex/nestedvm/linker.ld -Wl,--gc-sections
+MIPS_LDFLAGS= $(flags) --static -Wl,--gc-sections
 MIPS_STRIP = mips-unknown-elf-strip
 
 # Java compiler/VM settings
@@ -186,10 +184,12 @@ unixruntime.jar: $(unixruntime_classes:%=build/org/ibex/nestedvm/%.class)
 # This is only for Brian to use... don't mess with it
 rebuild-constants: $(tasks)/build_newlib
 	@mkdir -p `dirname $@`
-	cat \
-		src/org/ibex/nestedvm/syscalls.h \
-		$(usr)/mips-unknown-elf/include/sys/{errno.h,unistd.h,syslimits.h} \
-	| ( \
+	( \
+		cat \
+			src/org/ibex/nestedvm/syscalls.h \
+			$(usr)/mips-unknown-elf/include/sys/{errno.h,unistd.h,syslimits.h}; \
+		$(MIPS_CC) -E -dM $(usr)/mips-unknown-elf/include/sys/fcntl.h | awk '$$2 ~ /^[OF]_/ { print; }'; \
+	) | ( \
 		echo "// THIS FILE IS AUTOGENERATED! DO NOT EDIT!"; \
 		echo "// run \"make rebuild-constants\" if it needs to be updated"; \
 		echo ""; \
@@ -284,12 +284,12 @@ build/tests/DJpeg.mips: $(mips_objects) $(tasks)/build_libjpeg
 # Busybox
 #
 BusyBox_COMPILERFLAGS = -o unixruntime
-build/tests/BusyBox.mips: $(mips_object) $(tasks)/build_busybox
+build/tests/BusyBox.mips: $(mips_objects) $(tasks)/build_busybox
 	@mkdir -p `dirname $@`
 	cp upstream/build/busybox/busybox $@
 	
 busyboxtest: build/tests/BusyBox.class
-	$(JAVA) -cp build tests.BusyBox ash
+	$(JAVA) -cp $(classpath) tests.BusyBox ash
 
 #
 # Boehm GC