Use --build-id=none to avoid build-id sections on FC8.

[pintos-anon] / src / Makefile.userprog

diff --git a/src/Makefile.userprog b/src/Makefile.userprog
index 4cdf078ab9898f36ccbdec5835692b7a8c1c71b4..f90b08c965e365022aa78b0d97eb417c0160c6b4 100644 (file)
--- a/src/Makefile.userprog
+++ b/src/Makefile.userprog
@@ -1,47 +1,41 @@
 # -*- makefile -*-
 
-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)
-
-# 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 $@