Make linking of start.S less brittle.

[pintos-anon] / src / Makefile.inc

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 7561dffff4279c3e91451902ea8ac96e9d39ff3d..bab467aca9339fac0d0976e18c2af7b153be782c 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -3,7 +3,6 @@
 SHELL = /bin/sh
 
 CC = gcc
-CPP = $(CC) -E
 
 VPATH := $(TOP_SRCDIR)/threads
 VPATH := $(VPATH):$(TOP_SRCDIR)/devices
@@ -12,12 +11,11 @@ VPATH := $(VPATH):$(TOP_SRCDIR)/filesys
 VPATH := $(VPATH):$(TOP_SRCDIR)/userprog
 
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS = -g -O3 -MMD $(WARNINGS) $(INCLUDES) $(DEFINES)
+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.
@@ -26,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.
@@ -46,23 +45,27 @@ FILESYS_SRC  = filesys.c    # Filesystem core.
 FILESYS_SRC += file.c          # Files.
 FILESYS_SRC += directory.c     # Directories.
 FILESYS_SRC += filehdr.c       # File headers (inodes).
+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: $(TOP_SRCDIR)/threads/kernel.lds.in $(TOP_SRCDIR)/threads/loader.h
+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
-       ld -T kernel.lds -o $@ $(OBJECTS) `$(CC) -print-libgcc-file-name`
+kernel.o: $(OBJECTS) kernel.lds.s
+       ld -T kernel.lds.s -o $@ $(OBJECTS) `$(CC) -print-libgcc-file-name`
 
 kernel.bin: kernel.o
        objcopy -O binary -R .note -R .comment -S $< $@.tmp
@@ -77,6 +80,6 @@ diskimage.bin: loader.bin kernel.bin
 
 clean:
        rm -f *.o *.d *.bin
-       rm -f kernel.bin.data kernel.bin.pad intr-stubs.S kernel.lds
+       rm -f kernel.bin.data kernel.bin.pad intr-stubs.S kernel.lds.s
 
 -include *.d