Always use a custom linker script, to avoid oddities in the default.

[pintos-anon] / src / Makefile.userprog

diff --git a/src/Makefile.userprog b/src/Makefile.userprog
index 29bdcf8b73f1306f250123310588ad982c54dc5d..2ecb8e737f9f6061506e84fc1e067e2ac685a021 100644 (file)
--- a/src/Makefile.userprog
+++ b/src/Makefile.userprog
@@ -10,8 +10,12 @@ DEFINES = -DPINTOS -DUSER
 CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user -I.
 
 # Linker flags.
-LDFLAGS = -nostdlib -static -s
+LDFLAGS = -nostdlib -static -Wl,-T,$(LDSCRIPT)
 LDLIBS = $(shell $(CC) -print-libgcc-file-name)
+LDSCRIPT = $(SRCDIR)/lib/user/normal.lds
+# Uncomment the following line to round up section sizes
+# to full pages (for debugging only).
+#LDSCRIPT = $(SRCDIR)/lib/user/fullpage.lds
 
 # C library sources linked into every test program.
 LIB_SRC  = lib/debug.c                 # Debug code.
@@ -20,7 +24,6 @@ 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)))
@@ -35,14 +38,12 @@ all: $(PROGS)
 
 define TEMPLATE
 $(2)_OBJ = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$($(2)_SRC)))
-$(1): $$($(2)_OBJ) $$(LIB)
-       $$(CC) $$(LDFLAGS) $$^ $$(LDLIBS) -o $$@
+$(1): $$($(2)_OBJ) $$(LIB) $$(LDSCRIPT)
+       $$(CC) $$(LDFLAGS) $$($(2)_OBJ) $$(LIB) $$(LDLIBS) -o $$@
 endef
 
 $(foreach prog,$(PROGS),$(eval $(call TEMPLATE,$(prog),$(subst -,_,$(prog)))))
 
-$(PROGS): $(LIB)
-
 libc.a: $(LIB_OBJ)
        rm -f $@
        ar r $@ $^