VPATH := $(VPATH):$(TOP_SRCDIR)/userprog
WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
VPATH := $(VPATH):$(TOP_SRCDIR)/userprog
WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS = -g -O3 -MMD $(WARNINGS) $(INCLUDES) $(DEFINES)
-ASFLAGS = -Wa,--gstabs+ $(INCLUDES) $(DEFINES)
+CFLAGS = -g -O3 -MMD -msoft-float $(WARNINGS) $(INCLUDES) $(DEFINES)
+ASFLAGS = -Wa,--gstabs $(INCLUDES) $(DEFINES)
THREADS_SRC += thread.c # Thread management core.
THREADS_SRC += switch.S # Thread switch routine.
THREADS_SRC += interrupt.c # Interrupt core.
THREADS_SRC += thread.c # Thread management core.
THREADS_SRC += switch.S # Thread switch routine.
THREADS_SRC += interrupt.c # Interrupt core.
THREADS_SRC += paging.c # Page tables.
THREADS_SRC += palloc.c # Page allocator.
THREADS_SRC += malloc.c # Subpage allocator.
THREADS_SRC += paging.c # Page tables.
THREADS_SRC += palloc.c # Page allocator.
THREADS_SRC += malloc.c # Subpage allocator.
LIB_SRC += random.c # Pseudo-random numbers.
LIB_SRC += list.c # Doubly-linked lists.
LIB_SRC += bitmap.c # Bitmaps.
LIB_SRC += random.c # Pseudo-random numbers.
LIB_SRC += list.c # Doubly-linked lists.
LIB_SRC += bitmap.c # Bitmaps.
# Filesystem code.
FILESYS_SRC = filesys.c # Filesystem core.
FILESYS_SRC += file.c # Files.
FILESYS_SRC += directory.c # Directories.
FILESYS_SRC += filehdr.c # File headers (inodes).
# Filesystem code.
FILESYS_SRC = filesys.c # Filesystem core.
FILESYS_SRC += file.c # Files.
FILESYS_SRC += directory.c # Directories.
FILESYS_SRC += filehdr.c # File headers (inodes).
# Objects.
OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
all: diskimage.bin
# Objects.
OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
all: diskimage.bin
-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`