X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.inc;h=d6b9519edd9052672a8b97daedcabbea5de3b5d3;hb=c9c283cb3e26a5b6d918ee47dcf8efe28522b18d;hp=7561dffff4279c3e91451902ea8ac96e9d39ff3d;hpb=77be43c0bae7a315c4863b21e7cad53f19268b39;p=pintos-anon

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 7561dff..d6b9519 100644
--- 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,13 @@ 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 += gdt.c		# GDT initialization.
 THREADS_SRC += thread.c		# Thread management core.
 THREADS_SRC += switch.S		# Thread switch routine.
 THREADS_SRC += interrupt.c	# Interrupt core.
@@ -46,6 +46,7 @@ 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.
@@ -55,14 +56,14 @@ 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/gdt.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 +78,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