diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.build | 4 | ||||
| -rw-r--r-- | src/Makefile.userprog | 41 | ||||
| -rw-r--r-- | src/examples/Makefile | 8 |
3 files changed, 30 insertions, 23 deletions
diff --git a/src/Makefile.build b/src/Makefile.build index a9e5a23..1f0fa35 100644 --- a/src/Makefile.build +++ b/src/Makefile.build @@ -83,7 +83,7 @@ LIBDIR_RUST = $(SRCDIR)/../kernel LIB_RUST = libkernel-rs.a $(LIB_RUST): - make -C $(LIBDIR_RUST) debug + (cd $(LIBDIR_RUST) && cargo build) cp $(LIBDIR_RUST)/target/debug/libkernel.a $@ .PHONY: $(LIB_RUST) @@ -106,7 +106,7 @@ os.dsk: loader.bin kernel.bin cat $^ > $@ clean:: - make -C $(LIBDIR_RUST) clean + (cd $(LIBDIR_RUST) && cargo clean) rm -f $(OBJECTS) $(DEPENDS) rm -f threads/loader.o threads/kernel.lds.s threads/loader.d rm -f kernel.o kernel.lds.s diff --git a/src/Makefile.userprog b/src/Makefile.userprog index f15ec78..d6914cf 100644 --- a/src/Makefile.userprog +++ b/src/Makefile.userprog @@ -8,6 +8,13 @@ $(PROGS): LDSCRIPT = $(SRCDIR)/lib/user/user.lds # filst04@liu 2014-01: Added to ignore the build-id located at offset 0. $(PROGS): LDFLAGS += $(LDFLAG_BUILD_ID) +# Duplicate for rs +$(PROGS_RS): CPPFLAGS += -I$(SRCDIR)/lib/user -I. +$(PROGS_RS): LDFLAGS = -nostdlib -static -Wl,-T,$(LDSCRIPT) +$(PROGS_RS): LDSCRIPT = $(SRCDIR)/lib/user/user.lds +# filst04@liu 2014-01: Added to ignore the build-id located at offset 0. +$(PROGS_RS): LDFLAGS += $(LDFLAG_BUILD_ID) + # Library code shared between kernel and user programs. lib_SRC = lib/debug.c # Debug code. lib_SRC += lib/random.c # Pseudo-random numbers. @@ -23,16 +30,14 @@ lib/user_SRC += lib/user/console.c # Console code. LIB_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(lib_SRC) $(lib/user_SRC))) LIB_DEP = $(patsubst %.o,%.d,$(LIB_OBJ)) -LIB = lib/user/entry.o libc.a -LIB_RUST = lib/user/entry.o librust.a - -LIBDIR_RUST = $(SRCDIR)/../rust +LIB_ENTRY = lib/user/entry.o +LIB = $(LIB_ENTRY) libc.a PROGS_SRC = $(foreach prog,$(PROGS),$($(prog)_SRC)) PROGS_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(PROGS_SRC))) PROGS_DEP = $(patsubst %.o,%.d,$(PROGS_OBJ)) -all: $(PROGS) +all: $(PROGS) $(PROGS_RS) # filst04@liu 2014-01: Needed to not break the system call functions # on modern Linux'es, works on SunOS too @@ -40,27 +45,31 @@ lib/user/syscall.o: CPPFLAGS += -fno-omit-frame-pointer define TEMPLATE $(1)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(1)_SRC))) -$(1): $$($(1)_OBJ) $(2) $$(LDSCRIPT) - $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $(2) -o $$@ +$(1): $$($(1)_OBJ) $$(LIB) $$(LDSCRIPT) + $$(CC) $$(LDFLAGS) $$($(1)_OBJ) $$(LIB) -o $$@ endef -$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog),$(LIB)))) -$(foreach prog,$(PROGS_RUST),$(eval $(call TEMPLATE,$(prog),$(LIB_RUST)))) +define TEMPLATE_RS +lib$(1).a: + (cd $$($(1)_SRC) && cargo build) + cp $$($(1)_SRC)/target/debug/lib$(1).a . +.PHONY: lib$(1).a +$(1): rust.o lib$(1).a $$(LIB_RUST) $$(LDSCRIPT) + $$(CC) $$(LDFLAGS) $$(LIB_ENTRY) rust.o lib$(1).a -o $$@ +endef + +$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog)))) +$(foreach prog,$(PROGS_RS),$(eval $(call TEMPLATE_RS,$(prog)))) libc.a: $(LIB_OBJ) rm -f $@ ar r $@ $^ ranlib $@ -librust.a: - make -C $(LIBDIR_RUST) debug - cp $(LIBDIR_RUST)/target/debug/librust.a $@ - clean:: rm -f $(PROGS) $(PROGS_OBJ) $(PROGS_DEP) - make -C $(LIBDIR_RUST) clean - rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a librust.a + rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a -.PHONY: all clean librust.a +.PHONY: all clean -include $(LIB_DEP) $(PROGS_DEP) diff --git a/src/examples/Makefile b/src/examples/Makefile index dba72c9..dd777ae 100644 --- a/src/examples/Makefile +++ b/src/examples/Makefile @@ -3,18 +3,16 @@ SRCDIR = .. # Test programs to compile, and a list of sources for each. # To add a new test, put its name on the PROGS list # and then add a name_SRC line that lists its source files. -PROGS_C = cat cmp cp echo halt hex-dump ls mcat mcp mkdir pwd rm shell \ +PROGS = cat cmp cp echo halt hex-dump ls mcat mcp mkdir pwd rm shell \ bubsort insult lineup matmult recursor \ sumargv pfs pfs_reader pfs_writer dummy longrun \ child parent generic_parent longrun_interactive busy \ line_echo file_syscall_tests longrun_nowait shellcode \ crack overflow dir_stress create_file create_remove_file -PROGS_RUST = rust +PROGS_RS = haltrs -PROGS = $(PROGS_C) $(PROGS_RUST) - -rust_SRC = rust.c +haltrs_SRC = $(SRCDIR)/../halt-rs # Added test programs sumargv_SRC = sumargv.c |