X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=885c1c3af3e42f3acf981b191adeebc1e75ab960;hp=c744751539238825d05cf1faf3b457fc42febc72;hb=943522818291869953657ce12e96f229dba03601;hpb=1559c0f40ba4ce4d6eb544cd1593beb60a0f49b2

diff --git a/Makefile b/Makefile
index c744751..885c1c3 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ tasks = upstream/tasks
 flags = -march=mips1
 MIPS_CC = mips-unknown-elf-gcc
 MIPS_CXX = mips-unknown-elf-g++
+MIPS_G77 = mips-unknown-elf-g77
 
 # Be VERY careful about changing any of these as they can break binary 
 # compatibility and create hard to find bugs
@@ -220,7 +221,7 @@ rebuild-constants: $(tasks)/build_newlib
 		echo "public interface UsermodeConstants {"; \
 		tr '\t' ' ' | sed -n ' \
 			s/  */ /g; \
-			s/ *# *define \([A-Z_][A-Za-z0-9_]*\) \([0-9][0-9x]*\)/    public static final int \1 = \2;/p'; \
+			s/ *# *define \([A-Z_][A-Za-z0-9_]*\) \([0-9][0-9a-fA-Fx]*\)/    public static final int \1 = \2;/p'; \
 		echo "}"; \
 	) > src/org/ibex/nestedvm/UsermodeConstants.java
 
@@ -233,6 +234,7 @@ rebuild-constants: $(tasks)/build_newlib
 build/tests/Env.class: build/org/ibex/nestedvm/Runtime.class build/org/ibex/nestedvm/Interpreter.class
 
 # Generic Hello Worldish test
+test_COMPILERFLAGS = -o unixruntime
 test: build/tests/Test.class
 	$(JAVA) -cp build tests.Test "arg 1" "arg 2" "arg 3"
 inttest: build/tests/Test.mips build/org/ibex/nestedvm/Interpreter.class
@@ -261,7 +263,7 @@ Paranoia_CFLAGS = "-Wno-error"
 Paranoia_LDFLAGS = -lm
 paranoiatest: build/tests/Paranoia.class
 	$(JAVA) -cp build tests.Paranoia
-
+	
 #
 # Freetype Stuff
 #
@@ -312,7 +314,7 @@ build/tests/BusyBox.mips: $(mips_objects) $(tasks)/build_busybox
 	cp upstream/build/busybox/busybox $@
 
 busyboxtest: build/tests/BusyBox.class
-	$(JAVA) -cp $(classpath) tests.BusyBox ash
+	$(JAVA) -Dnestedvm.busyboxhack=true -cp $(classpath) tests.BusyBox ash
 
 #
 # Boehm GC