move extra headers

[nestedvm.git] / Makefile

diff --git a/Makefile b/Makefile
index baabb85..677899d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ flags = -march=mips1
 MIPS_CC = mips-unknown-elf-gcc
 MIPS_CXX = mips-unknown-elf-g++
 MIPS_G77 = mips-unknown-elf-g77
+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
@@ -35,6 +36,8 @@ mips_optflags = -O3 -g \
        -freduce-all-givs
 
 MIPS_CFLAGS = $(mips_optflags) $(flags) -I. -Wall -Wno-unused -Werror
+MIPS_CXXFLAGS = $(MIPS_CFLAGS)
+MIPS_PCFLAGS = $(MIPS_CFLAGS) --big-endian
 MIPS_LD = mips-unknown-elf-gcc
 MIPS_LDFLAGS= $(flags) --static -Wl,--gc-sections
 MIPS_STRIP = mips-unknown-elf-strip
@@ -57,7 +60,9 @@ EXE_EXT =
 #####
 
 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)
@@ -71,9 +76,13 @@ ifdef NATIVE_MIPS2JAVA_COMPILER
 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/misc/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)"
 
@@ -104,7 +113,14 @@ build/mips2java$(EXE_EXT): $(java_sources) $(java_gen_sources)
 #
 # MIPS Binary compilation
 #
-build/%.o: src/%.c $(tasks)/build_gcc
+
+# The nestedvm support library is special, it doesn't a full libc
+$(mips_c_objects): build/%.o: src/%.c $(tasks)/build_gcc $(tasks)/build_newlib $(tasks)/build_extraheaders
+       @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 $@ $<
 
@@ -112,17 +128,22 @@ build/%.o: src/%.s $(tasks)/build_gcc
        @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 $@ $<
+       $(MIPS_CXX) $(MIPS_CXXFLAGS) $($(notdir $*)_CXXFLAGS) $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -o $@ $<
 
-build/%.mips.stripped: build/%.mips
+build/%.mips: src/%.pas $(tasks)/build_gpc
+       @mkdir -p `dirname $@`
+       $(MIPS_PC) $(MIPS_PCFLAGS) $($(notdir $*)_PCFLAGS) $(MIPS_LDFLAGS) $($(notdir $*)_LDFLAGS) -o $@ $<
+
+build/%.mips.stripped: build/%.mips $(tasks)/build_linker
        cp $< $@
        $(MIPS_STRIP) -s $@
 
@@ -152,7 +173,7 @@ clean:
 #
 # 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' >> $@~
@@ -206,12 +227,13 @@ compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_gcclass
        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!"; \
@@ -252,6 +274,9 @@ build/tests/FDTest.class: build/tests/Test.class
 fdtest: build/tests/FDTest.class
        $(JAVA) -cp build tests.FDTest
 
+# Pascal Test
+pascaltest: build/tests/PascalHello.class
+       $(JAVA) -cp build tests.PascalHello
 
 # Simple
 Simple_LDFLAGS = -nostdlib
@@ -263,7 +288,15 @@ Paranoia_CFLAGS = "-Wno-error"
 Paranoia_LDFLAGS = -lm
 paranoiatest: build/tests/Paranoia.class
        $(JAVA) -cp build tests.Paranoia
-       
+
+# Linpack
+build/tests/Linpack.mips: $(tasks)/download_linpack $(tasks)/build_gcc_step2
+       mkdir -p `dirname "$@"`
+       $(MIPS_G77) $(MIPS_CFLAGS) $(MIPS_LDFLAGS) -o $@ upstream/download/linpack_bench.f -lc
+
+linpacktest: build/tests/Linpack.class
+       $(JAVA) -cp build tests.Linpack
+
 #
 # Freetype Stuff
 #
@@ -272,7 +305,7 @@ FreeType_LDFLAGS =  -Lupstream/build/freetype/objs -lfreetype
 
 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
 
@@ -285,7 +318,7 @@ build/tests/FTBench.o: $(tasks)/build_freetype
 #
 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
@@ -301,7 +334,7 @@ build/tests/Echo.class: build/tests/EchoHelper.class
 # 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 $@
 
@@ -309,17 +342,17 @@ build/tests/DJpeg.mips: $(mips_objects) $(tasks)/build_libjpeg
 # 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 $@