#####
java_classes = $(java_sources:src/%.java=build/%.class)
-mips_objects = $(mips_sources:%.c=build/org/ibex/nestedvm/%.o) $(mips_asm_sources:%.s=build/org/ibex/nestedvm/%.o)
+mips_c_objects = $(mips_sources:%.c=build/org/ibex/nestedvm/%.o)
+mips_asm_objects = $(mips_asm_sources:%.s=build/org/ibex/nestedvm/%.o)
+mips_objects = $(mips_asm_objects) $(mips_c_objects)
usr = $(mips2java_root)/upstream/install
PATH := $(usr)/bin:$(PATH)
all: build/mips2java$(EXE_EXT) $(mips_objects)
endif
+# HACK: Ensure libc is kept up to date when our mips_objects change
+$(tasks)/build_libc: $(mips_object) upstream/patches/newlib-extraheaders.sh
+
$(tasks)/%:
$(MAKE) -C upstream tasks/$* usr="$(usr)" MIPS_LDFLAGS="$(MIPS_LDFLAGS)" MIPS_CFLAGS="$(flags) $(mips_optflags)"
+
upstream_clean_%:
$(MAKE) -C upstream clean_$* usr="$(usr)"
#
# MIPS Binary compilation
#
-build/%.o: src/%.c $(tasks)/build_gcc
+build/%.o: src/%.c $(tasks)/full_toolchain
+ @mkdir -p `dirname $@`
+ $(MIPS_CC) $(MIPS_CFLAGS) -c -o $@ $<
+
+# Everything else needs a full libc
+build/%.o: src/%.c $(tasks)/build_gcc $(tasks)/build_libc
@mkdir -p `dirname $@`
$(MIPS_CC) $(MIPS_CFLAGS) $($(notdir $*)_CFLAGS) -c -o $@ $<
-build/%.o: src/%.s $(tasks)/build_gcc
+build/%.o: src/%.s $(tasks)/full_toolchain
@mkdir -p `dirname $@`
$(MIPS_CC) -x assembler-with-cpp -c -o $@ $<
-%.s: %.c $(tasks)/full_toolchain
+tmp/%.s: %.c $(tasks)/build_gcc
+ @mkdir -p `dirname $@`
$(MIPS_CC) $(MIPS_CFLAGS) $($(notdir $*)_CFLAGS) -c -S -o $@ $<
-build/%.mips: build/%.o $(mips_objects)
+build/%.mips: build/%.o $(tasks)/build_gcc $(tasks)/build_libc
$(MIPS_LD) -o $@ $< $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS)
-build/%.mips: src/%.cc $(tasks)/full_toolchain $(mips_objects)
+build/%.mips: src/%.cc $(tasks)/build_gcc_step2 $(tasks)/build_libc
@mkdir -p `dirname $@`
$(MIPS_CXX) $(MIPS_CFLAGS) $($(notdir $*)_CFLAGS) $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -o $@ $<
-build/%.mips.stripped: build/%.mips
+build/%.mips.stripped: build/%.mips $(tasks)/build_linker
cp $< $@
$(MIPS_STRIP) -s $@
#
# env.sh
#
-env.sh: Makefile $(tasks)/full_toolchain build/org/ibex/nestedvm/Compiler.class
+env.sh: Makefile $(tasks)/build_gcc $(tasks)/build_libc build/org/ibex/nestedvm/Compiler.class
@rm -f "$@~"
@echo 'PATH="$(mips2java_root)/build:$(usr)/bin:$$PATH"; export PATH' >> $@~
@echo 'CC=mips-unknown-elf-gcc; export CC' >> $@~
cd tmp/pruned && jar cfm ../../$@ ../../.manifest .
# This is only for Brian to use... don't mess with it
-rebuild-constants: $(tasks)/build_newlib
+rebuild-constants: $(tasks)/build_libc
@mkdir -p `dirname $@`
( \
cat \
src/org/ibex/nestedvm/syscalls.h \
- $(usr)/mips-unknown-elf/include/sys/{errno.h,unistd.h,syslimits.h}; \
+ $(usr)/mips-uknown-elf/include/nestedvm/sockets.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; }'; \
) | ( \
echo "// THIS FILE IS AUTOGENERATED! DO NOT EDIT!"; \
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
FreeTypeDemoHelper_CFLAGS = $(FreeType_CFLAGS)
FreeTypeDemoHelper_LDFLAGS = $(FreeType_LDFLAGS)
-build/tests/FreeTypeDemoHelper.o: $(mips_objects) $(tasks)/build_freetype
+build/tests/FreeTypeDemoHelper.o: $(tasks)/build_freetype
build/tests/FreeTypeDemoHelper.mips:
build/tests/FreeTypeDemo.class: build/tests/FreeTypeDemoHelper.class
#
MSPackHelper_CFLAGS = -Iupstream/build/libmspack/mspack
MSPackHelper_LDFLAGS = -Lupstream/build/libmspack/mspack -lmspack
-build/tests/MSPackHelper.o: $(mips_objects) $(tasks)/build_libmspack
+build/tests/MSPackHelper.o: $(tasks)/build_libmspack
build/tests/MSPack.class: build/tests/MSPackHelper.class
MSPackBench_CFLAGS = -Iupstream/build/libmspack/mspack
# Libjpeg
#
DJpeg_COMPILERFLAGS = -o onepage,pagesize=8m
-build/tests/DJpeg.mips: $(mips_objects) $(tasks)/build_libjpeg
+build/tests/DJpeg.mips: $(tasks)/build_libjpeg
@mkdir -p `dirname $@`
cp upstream/build/libjpeg/djpeg $@
# Busybox
#
BusyBox_COMPILERFLAGS = -o unixruntime
-build/tests/BusyBox.mips: $(mips_objects) $(tasks)/build_busybox
+build/tests/BusyBox.mips: $(tasks)/build_busybox
@mkdir -p `dirname $@`
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
#
-build/tests/GCTest.mips: $(mips_objects) $(tasks)/build_boehmgc
+build/tests/GCTest.mips: $(tasks)/build_boehmgc
@mkdir -p `dirname $@`
cp upstream/build/boehmgc/gctest $@