projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update tests.
[pintos-anon]
/
src
/
Makefile.userprog
diff --git
a/src/Makefile.userprog
b/src/Makefile.userprog
index e28a408a3bc1a5f03ddca7476c1c9fdfef1a48a7..0d93189d68a87ff0c4fabdf2dba6a88ef13fea11 100644
(file)
--- a/
src/Makefile.userprog
+++ b/
src/Makefile.userprog
@@
-1,3
+1,5
@@
+# -*- makefile -*-
+
include $(SRCDIR)/Make.config
SHELL = /bin/sh
include $(SRCDIR)/Make.config
SHELL = /bin/sh
@@
-5,16
+7,12
@@
SHELL = /bin/sh
VPATH = $(SRCDIR)
DEFINES = -DUSER
VPATH = $(SRCDIR)
DEFINES = -DUSER
-CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user
+CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user
-I.
# Linker flags.
LDFLAGS = -nostdlib -static -s
LDLIBS = $(shell $(CC) -print-libgcc-file-name)
# Linker flags.
LDFLAGS = -nostdlib -static -s
LDLIBS = $(shell $(CC) -print-libgcc-file-name)
-# Uncomment the line below to round up segment sizes to full pages for
-# testing purposes only.
-#LDFLAGS += -Wl,-T,fullpage.x
-
# C library sources linked into every test program.
LIB_SRC = lib/debug.c # Debug code.
LIB_SRC += lib/random.c # Pseudo-random numbers.
# C library sources linked into every test program.
LIB_SRC = lib/debug.c # Debug code.
LIB_SRC += lib/random.c # Pseudo-random numbers.
@@
-29,18
+27,19
@@
LIB_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(LIB_SRC)))
LIB_DEP = $(patsubst %.o,%.d,$(LIB_OBJ))
LIB = lib/user/entry.o libc.a
LIB_DEP = $(patsubst %.o,%.d,$(LIB_OBJ))
LIB = lib/user/entry.o libc.a
-PROGS_SRC = $(foreach prog,$(PROGS),$($(
prog
)_SRC))
+PROGS_SRC = $(foreach prog,$(PROGS),$($(
subst -,_,$(prog)
)_SRC))
PROGS_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(PROGS_SRC)))
PROGS_DEP = $(patsubst %.o,%.d,$(PROGS_OBJ))
all: $(PROGS)
define TEMPLATE
PROGS_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(PROGS_SRC)))
PROGS_DEP = $(patsubst %.o,%.d,$(PROGS_OBJ))
all: $(PROGS)
define TEMPLATE
-$(1)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(1)_SRC)))
-$(1): $$($(1)_OBJ) $$(LIB)
+$(2)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(2)_SRC)))
+$(1): $$($(2)_OBJ) $$(LIB)
+ $$(CC) $$(LDFLAGS) $$^ $$(LDLIBS) -o $$@
endef
endef
-$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog))))
+$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog)
,$(subst -,_,$(prog))
)))
$(PROGS): $(LIB)
$(PROGS): $(LIB)
@@
-49,7
+48,7
@@
libc.a: $(LIB_OBJ)
ar r $@ $^
ranlib $@
ar r $@ $^
ranlib $@
-clean:
+clean:
:
rm -f $(PROGS) $(PROGS_OBJ) $(PROGS_DEP)
rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a
rm -f $(PROGS) $(PROGS_OBJ) $(PROGS_DEP)
rm -f $(LIB_DEP) $(LIB_OBJ) lib/user/entry.[do] libc.a