projects
/
nestedvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleaner gcc build process
[nestedvm.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
c744751
..
2d7ca43
100644
(file)
--- 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++
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
# Be VERY careful about changing any of these as they can break binary
# compatibility and create hard to find bugs
@@
-56,7
+57,9
@@
EXE_EXT =
#####
java_classes = $(java_sources:src/%.java=build/%.class)
#####
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)
usr = $(mips2java_root)/upstream/install
PATH := $(usr)/bin:$(PATH)
@@
-70,9
+73,13
@@
ifdef NATIVE_MIPS2JAVA_COMPILER
all: build/mips2java$(EXE_EXT) $(mips_objects)
endif
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)"
$(tasks)/%:
$(MAKE) -C upstream tasks/$* usr="$(usr)" MIPS_LDFLAGS="$(MIPS_LDFLAGS)" MIPS_CFLAGS="$(flags) $(mips_optflags)"
+
upstream_clean_%:
$(MAKE) -C upstream clean_$* usr="$(usr)"
upstream_clean_%:
$(MAKE) -C upstream clean_$* usr="$(usr)"
@@
-103,25
+110,31
@@
build/mips2java$(EXE_EXT): $(java_sources) $(java_gen_sources)
#
# MIPS Binary compilation
#
#
# 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 $@ $<
@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 $@ $<
@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 $@ $<
$(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)
$(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 $@ $<
@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 $@
cp $< $@
$(MIPS_STRIP) -s $@
@@
-151,7
+164,7
@@
clean:
#
# env.sh
#
#
# 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' >> $@~
@rm -f "$@~"
@echo 'PATH="$(mips2java_root)/build:$(usr)/bin:$$PATH"; export PATH' >> $@~
@echo 'CC=mips-unknown-elf-gcc; export CC' >> $@~
@@
-205,12
+218,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
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 \
@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!"; \
$(MIPS_CC) -E -dM $(usr)/mips-unknown-elf/include/sys/fcntl.h | awk '$$2 ~ /^[OF]_/ { print; }'; \
) | ( \
echo "// THIS FILE IS AUTOGENERATED! DO NOT EDIT!"; \
@@
-220,7
+234,7
@@
rebuild-constants: $(tasks)/build_newlib
echo "public interface UsermodeConstants {"; \
tr '\t' ' ' | sed -n ' \
s/ */ /g; \
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
echo "}"; \
) > src/org/ibex/nestedvm/UsermodeConstants.java
@@
-233,6
+247,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
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
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
+276,7
@@
Paranoia_CFLAGS = "-Wno-error"
Paranoia_LDFLAGS = -lm
paranoiatest: build/tests/Paranoia.class
$(JAVA) -cp build tests.Paranoia
Paranoia_LDFLAGS = -lm
paranoiatest: build/tests/Paranoia.class
$(JAVA) -cp build tests.Paranoia
-
+
#
# Freetype Stuff
#
#
# Freetype Stuff
#
@@
-270,7
+285,7
@@
FreeType_LDFLAGS = -Lupstream/build/freetype/objs -lfreetype
FreeTypeDemoHelper_CFLAGS = $(FreeType_CFLAGS)
FreeTypeDemoHelper_LDFLAGS = $(FreeType_LDFLAGS)
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
build/tests/FreeTypeDemoHelper.mips:
build/tests/FreeTypeDemo.class: build/tests/FreeTypeDemoHelper.class
@@
-283,7
+298,7
@@
build/tests/FTBench.o: $(tasks)/build_freetype
#
MSPackHelper_CFLAGS = -Iupstream/build/libmspack/mspack
MSPackHelper_LDFLAGS = -Lupstream/build/libmspack/mspack -lmspack
#
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
build/tests/MSPack.class: build/tests/MSPackHelper.class
MSPackBench_CFLAGS = -Iupstream/build/libmspack/mspack
@@
-299,7
+314,7
@@
build/tests/Echo.class: build/tests/EchoHelper.class
# Libjpeg
#
DJpeg_COMPILERFLAGS = -o onepage,pagesize=8m
# 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 $@
@mkdir -p `dirname $@`
cp upstream/build/libjpeg/djpeg $@
@@
-307,17
+322,17
@@
build/tests/DJpeg.mips: $(mips_objects) $(tasks)/build_libjpeg
# Busybox
#
BusyBox_COMPILERFLAGS = -o unixruntime
# 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
@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
#
#
# 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 $@
@mkdir -p `dirname $@`
cp upstream/build/boehmgc/gctest $@