X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2FMakefile.inc;h=982b5e800f5e5b63f9ddb5f0a7772beb80ab626c;hp=c125ebaeb7be4447f9258b2736c354a73c1538d9;hb=6c5c6fdfe80bad40c90c19b67f00226610d59a38;hpb=c9d103e3fc1f398acb10bbaa66bf5a61318d26e9

diff --git a/src/Makefile.inc b/src/Makefile.inc
index c125eba..982b5e8 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -17,8 +17,6 @@ ASFLAGS = -Wa,--gstabs+ $(INCLUDES) $(DEFINES)
 # Core kernel.
 THREADS_SRC  = start.S		# Must be linked first.
 THREADS_SRC += init.c		# Main program.
-THREADS_SRC += gdt.c		# GDT initialization.
-THREADS_SRC += tss.c		# TSS management.
 THREADS_SRC += thread.c		# Thread management core.
 THREADS_SRC += switch.S		# Thread switch routine.
 THREADS_SRC += interrupt.c	# Interrupt core.
@@ -51,13 +49,16 @@ FILESYS_SRC += fsutil.c		# Utilities.
 
 # User process code.
 USERPROG_SRC  = addrspace.c	# Address spaces.
+USERPROG_SRC += exception.c	# User exception handler.
+USERPROG_SRC += gdt.c		# GDT initialization.
+USERPROG_SRC += tss.c		# TSS management.
 
 # Objects.
 OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
 
 all: diskimage.bin
 
-intr-stubs.S: $(TOP_SRCDIR)/threads/intr-stubs.pl $(TOP_SRCDIR)/threads/gdt.h
+intr-stubs.S: $(TOP_SRCDIR)/threads/intr-stubs.pl $(TOP_SRCDIR)/threads/loader.h
 	$< > $@
 
 kernel.lds.s: $(TOP_SRCDIR)/threads/kernel.lds.S $(TOP_SRCDIR)/threads/loader.h