Move assignment to _end_kernel_text inside .rodata.

[pintos-anon] / src / Makefile.userprog

diff --git a/src/Makefile.userprog b/src/Makefile.userprog
index 72e35ce7ee92a285e4d1b6562318247bda427754..447088e8e7896212d8b5ce91879a0854b43f4cd4 100644 (file)
--- a/src/Makefile.userprog
+++ b/src/Makefile.userprog
@@ -1,16 +1,11 @@
 # -*- makefile -*-
 
-include $(SRCDIR)/Make.config
-
 $(PROGS): CPPFLAGS += -I$(SRCDIR)/lib/user -I.
 
 # Linker flags.
 $(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
+$(PROGS): LDSCRIPT = $(SRCDIR)/lib/user/user.lds
 
 # Library code shared between kernel and user programs.
 lib_SRC  = lib/debug.c                 # Debug code.