X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2FMakefile.userprog;h=f90b08c965e365022aa78b0d97eb417c0160c6b4;hp=90506a0c180eb30e54727abd4966b043b428f2f1;hb=4ae5b30e5eb0be98521235060001c2d6d9828345;hpb=611bee1ebeae7fcc3dcee305cbe3ecbb915916f0

diff --git a/src/Makefile.userprog b/src/Makefile.userprog
index 90506a0..f90b08c 100644
--- a/src/Makefile.userprog
+++ b/src/Makefile.userprog
@@ -1,51 +1,41 @@
 # -*- makefile -*-
 
-include $(SRCDIR)/Make.config
-
-SHELL = /bin/sh
-
-VPATH = $(SRCDIR)
-
-DEFINES = -DPINTOS -DUSER
-CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user -I.
+$(PROGS): CPPFLAGS += -I$(SRCDIR)/lib/user -I.
 
 # Linker flags.
-# If you want to include debug symbols, comment out the STRIP assignment,
-# or invoke `make' as `make STRIP='.
-# Otherwise debug symbols will be omitted from executables to save space.
-STRIP = -s
-LDFLAGS = -nostdlib -static $(STRIP)
-LDLIBS = $(shell $(CC) -print-libgcc-file-name)
-
-# 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): LDSCRIPT = $(SRCDIR)/lib/user/user.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.
+lib_SRC += lib/arithmetic.c
+
+# 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
 
-PROGS_SRC = $(foreach prog,$(PROGS),$($(subst -,_,$(prog))_SRC))
+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)
 
 define TEMPLATE
-$(2)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(2)_SRC)))
-$(1): $$($(2)_OBJ) $$(LIB)
-	$$(CC) $$(LDFLAGS) $$^ $$(LDLIBS) -o $$@
+$(1)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(1)_SRC)))
+$(1): $$($(1)_OBJ) $$(LIB) $$(LDSCRIPT)
+	$$(CC) $$(LDFLAGS) $$($(1)_OBJ) $$(LIB) -o $$@
 endef
 
-$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog),$(subst -,_,$(prog)))))
-
-$(PROGS): $(LIB)
+$(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog))))
 
 libc.a: $(LIB_OBJ)
 	rm -f $@