projects
/
nestedvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no more fixmes
[nestedvm.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
7f30324
..
e4143dc
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-35,9
+35,7
@@
mips_optflags = -O3 -g \
MIPS_CFLAGS = $(mips_optflags) $(flags) -I. -Wall -Wno-unused -Werror
MIPS_LD = mips-unknown-elf-gcc
MIPS_CFLAGS = $(mips_optflags) $(flags) -I. -Wall -Wno-unused -Werror
MIPS_LD = mips-unknown-elf-gcc
-MIPS_LDFLAGS= \
- $(flags) -L$(build)/org/ibex/nestedvm --static \
- -T $(mips2java_root)/src/org/ibex/nestedvm/linker.ld -Wl,--gc-sections
+MIPS_LDFLAGS= $(flags) --static -Wl,--gc-sections
MIPS_STRIP = mips-unknown-elf-strip
# Java compiler/VM settings
MIPS_STRIP = mips-unknown-elf-strip
# Java compiler/VM settings
@@
-78,12
+76,6
@@
$(tasks)/%:
upstream_clean_%:
$(MAKE) -C upstream clean_$* usr="$(usr)"
upstream_clean_%:
$(MAKE) -C upstream clean_$* usr="$(usr)"
-errno_h = $(usr)/mips-unknown-elf/include/sys/errno.h
-$(errno_h): $(tasks)/build_newlib
-
-unistd_h = $(usr)/mips-unknown-elf/include/sys/unistd.h
-$(unistd_h): $(tasks)/build_newlib
-
#
# Interpreter/Compiler/Runtime Java Compilation
#
#
# Interpreter/Compiler/Runtime Java Compilation
#
@@
-190,9
+182,14
@@
unixruntime.jar: $(unixruntime_classes:%=build/org/ibex/nestedvm/%.class)
cd build && jar cf ../$@ $(unixruntime_classes:%=org/ibex/nestedvm/%*.class)
# This is only for Brian to use... don't mess with it
cd build && jar cf ../$@ $(unixruntime_classes:%=org/ibex/nestedvm/%*.class)
# This is only for Brian to use... don't mess with it
-rebuild-constants: src/org/ibex/nestedvm/syscalls.h $(errno_h) $(unistd_h)
+rebuild-constants: $(tasks)/build_newlib
@mkdir -p `dirname $@`
@mkdir -p `dirname $@`
- cat $^ | ( \
+ ( \
+ cat \
+ src/org/ibex/nestedvm/syscalls.h \
+ $(usr)/mips-unknown-elf/include/sys/{errno.h,unistd.h,syslimits.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 "// run \"make rebuild-constants\" if it needs to be updated"; \
echo ""; \
echo "// THIS FILE IS AUTOGENERATED! DO NOT EDIT!"; \
echo "// run \"make rebuild-constants\" if it needs to be updated"; \
echo ""; \
@@
-287,12
+284,12
@@
build/tests/DJpeg.mips: $(mips_objects) $(tasks)/build_libjpeg
# Busybox
#
BusyBox_COMPILERFLAGS = -o unixruntime
# Busybox
#
BusyBox_COMPILERFLAGS = -o unixruntime
-build/tests/BusyBox.mips: $(mips_object) $(tasks)/build_busybox
+build/tests/BusyBox.mips: $(mips_objects) $(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 build tests.BusyBox ash
+ $(JAVA) -cp $(classpath) tests.BusyBox ash
#
# Boehm GC
#
# Boehm GC