Nicer way to generate kernel.lds.s.

[pintos-anon] / src / Makefile.inc

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 982b5e800f5e5b63f9ddb5f0a7772beb80ab626c..df6b01046a306f9efb4e20fd60d0819df8009ca0 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -12,11 +12,10 @@ VPATH := $(VPATH):$(TOP_SRCDIR)/userprog
 
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS = -g -O3 -MMD -msoft-float $(WARNINGS) $(INCLUDES) $(DEFINES)
-ASFLAGS = -Wa,--gstabs+ $(INCLUDES) $(DEFINES)
+ASFLAGS = -Wa,--gstabs $(INCLUDES) $(DEFINES)
 
 # Core kernel.
-THREADS_SRC  = start.S         # Must be linked first.
-THREADS_SRC += init.c          # Main program.
+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.
@@ -39,6 +39,7 @@ LIB_SRC += lib.c              # Standard C library.
 LIB_SRC += random.c            # Pseudo-random numbers.
 LIB_SRC += list.c              # Doubly-linked lists.
 LIB_SRC += bitmap.c            # Bitmaps.
+LIB_SRC += hash.c              # Hash tables.
 
 # Filesystem code.
 FILESYS_SRC  = filesys.c       # Filesystem core.
@@ -50,6 +51,7 @@ FILESYS_SRC += fsutil.c               # Utilities.
 # User process code.
 USERPROG_SRC  = addrspace.c    # Address spaces.
 USERPROG_SRC += exception.c    # User exception handler.
+USERPROG_SRC += syscall.c      # System call handler.
 USERPROG_SRC += gdt.c          # GDT initialization.
 USERPROG_SRC += tss.c          # TSS management.
 
@@ -61,8 +63,8 @@ all: diskimage.bin
 intr-stubs.S: $(TOP_SRCDIR)/threads/intr-stubs.pl $(TOP_SRCDIR)/threads/loader.h
        $< > $@
 
+kernel.lds.s: CPPFLAGS += -P -C
 kernel.lds.s: $(TOP_SRCDIR)/threads/kernel.lds.S $(TOP_SRCDIR)/threads/loader.h
-       $(CPP) -x assembler-with-cpp -P $< -o $@
 
 kernel.o: $(OBJECTS) kernel.lds.s
        ld -T kernel.lds.s -o $@ $(OBJECTS) `$(CC) -print-libgcc-file-name`