X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.userprog;h=72e35ce7ee92a285e4d1b6562318247bda427754;hb=f5dc6608c39a1ba7f92aec4ac7f04ec7281de6b4;hp=26d622d92d35848af03e1363e68e1fd79506f979;hpb=5979ba5edd96453f3658e58bdbd7686a4f4380e2;p=pintos-anon

diff --git a/src/Makefile.userprog b/src/Makefile.userprog
index 26d622d..72e35ce 100644
--- a/src/Makefile.userprog
+++ b/src/Makefile.userprog
@@ -2,32 +2,29 @@
 
 include $(SRCDIR)/Make.config
 
-SHELL = /bin/sh
-
-VPATH = $(SRCDIR)
-
-DEFINES = -DUSER
-CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user
+$(PROGS): CPPFLAGS += -I$(SRCDIR)/lib/user -I.
 
 # 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.
-LIB_SRC += lib/stdio.c			# I/O library.
-LIB_SRC += lib/stdlib.c			# atoi()
-LIB_SRC += lib/string.c			# String functions.
-LIB_SRC += lib/user/syscall.c		# System calls.
-LIB_SRC += lib/user/syscall-stub.S	# System call stub.
-LIB_SRC += lib/user/console.c		# Console code.
-
-LIB_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(LIB_SRC)))
+$(PROGS): LDFLAGS = -nostdlib -static -Wl,-T,$(LDSCRIPT)
+$(PROGS): LDLIBS = $(shell $(CC) -print-libgcc-file-name)
+$(PROGS): LDSCRIPT = $(SRCDIR)/lib/user/normal.lds
+# Uncomment the following line to round up section sizes
+# to full pages (for debugging only).
+#$(PROGS): LDSCRIPT = $(SRCDIR)/lib/user/fullpage.lds
+
+# Library code shared between kernel and user programs.
+lib_SRC  = lib/debug.c			# Debug code.
+lib_SRC += lib/random.c			# Pseudo-random numbers.
+lib_SRC += lib/stdio.c			# I/O library.
+lib_SRC += lib/stdlib.c			# Utility functions.
+lib_SRC += lib/string.c			# String functions.
+
+# User level only library code.
+lib/user_SRC  = lib/user/debug.c	# Debug helpers.
+lib/user_SRC += lib/user/syscall.c	# System calls.
+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
 
@@ -39,13 +36,12 @@ all: $(PROGS)
 
 define TEMPLATE
 $(1)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(1)_SRC)))
-$(1): $$($(1)_OBJ) $$(LIB)
+$(1): $$($(1)_OBJ) $$(LIB) $$(LDSCRIPT)
+	$$(CC) $$(LDFLAGS) $$($(1)_OBJ) $$(LIB) $$(LDLIBS) -o $$@
 endef
 
 $(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog))))
 
-$(PROGS): $(LIB)
-
 libc.a: $(LIB_OBJ)
 	rm -f $@
 	ar r $@ $^