X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.userprog;h=c5e6f3db33c6e992682c7b61818846b10b6a5034;hb=74263b7b2a2e61915cbfa1233a97058cca85d62d;hp=4cdf078ab9898f36ccbdec5835692b7a8c1c71b4;hpb=4d4065366785163248112abe34ac9a1ecd4b08b5;p=pintos-anon diff --git a/src/Makefile.userprog b/src/Makefile.userprog index 4cdf078..c5e6f3d 100644 --- a/src/Makefile.userprog +++ b/src/Makefile.userprog @@ -6,11 +6,11 @@ SHELL = /bin/sh VPATH = $(SRCDIR) -DEFINES = -DUSER -CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib -I$(SRCDIR)/lib/user +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 LDLIBS = $(shell $(CC) -print-libgcc-file-name) # C library sources linked into every test program. @@ -20,7 +20,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)))