use nestedvm.busyboxhack in busyboxtest

[nestedvm.git] / Makefile

diff --git a/Makefile b/Makefile
index 8a6af84..885c1c3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -221,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
 
@@ -314,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