Make linking of start.S less brittle.

[pintos-anon] / src / Makefile.inc

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 137beaab2a20a3f87111ed33174ebeca4d9abf8b..bab467aca9339fac0d0976e18c2af7b153be782c 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -15,8 +15,7 @@ CFLAGS = -g -O3 -MMD -msoft-float $(WARNINGS) $(INCLUDES) $(DEFINES)
 ASFLAGS = -Wa,--gstabs+ $(INCLUDES) $(DEFINES)
 
 # Core kernel.
-THREADS_SRC  = start.S         # Must be linked first.
-THREADS_SRC += init.c          # Start-up code.
+THREADS_SRC  = init.c          # Main program.
 THREADS_SRC += thread.c                # Thread management core.
 THREADS_SRC += switch.S                # Thread switch routine.
 THREADS_SRC += interrupt.c     # Interrupt core.
@@ -25,6 +24,7 @@ THREADS_SRC += synch.c                # Synchronization.
 THREADS_SRC += paging.c                # Page tables.
 THREADS_SRC += palloc.c                # Page allocator.
 THREADS_SRC += malloc.c                # Subpage allocator.
+THREADS_SRC += start.S         # Startup code.
 
 # Device driver code.
 DEVICES_SRC  = timer.c         # Timer device.
@@ -49,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
+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