Diff markup
>> 001
>> 002
>> 003
>> 004
>> 005
>> 006
>> 007
>> 008
>> 009
>> 010
>> 011
>> 012
>> 013
>> 014
>> 015
>> 016
>> 017
001 CC=gcc 018 CC=gcc
002 CFLAGS = -Wall -nostdlib -nostdinc -ffreestan !! 019 LD=ld
003 LDFLAGS = --warn-common !! 020 CP=cp
004 OBJECTS = bootstrap/multiboot.o !! 021 STRIP=strip
005 hwcore/idt.o hwcore/gdt.o !! 022 CFLAGS = -Wall -nostdinc -ffreestanding -DKERNEL_SOS -O -g
006 hwcore/exception.o hwcore/exception_ !! 023 LIBGCC = $(shell $(CC) -print-libgcc-file-name)
007 hwcore/irq.o hwcore/irq_wrappers.o h !! 024 LDFLAGS = --warn-common -nostdlib
008 hwcore/paging.o !! 025 OBJECTS = bootstrap/multiboot.o \
009 hwcore/i8254.o drivers/x86_videomem. !! 026 hwcore/idt.o hwcore/gdt.o \
010 sos/kmem_vmm.o sos/kmem_slab.o sos/k !! 027 hwcore/swintr.o hwcore/swintr_wrappers.o \
011 sos/physmem.o sos/klibc.o sos/main.o !! 028 hwcore/exception.o hwcore/exception_wrappers.o \
>> 029 hwcore/irq.o hwcore/irq_wrappers.o hwcore/i8259.o \
>> 030 hwcore/paging.o hwcore/i8254.o \
>> 031 hwcore/cpu_context.o hwcore/cpu_context_switch.o \
>> 032 hwcore/mm_context.o \
>> 033 sos/kmem_vmm.o sos/kmem_slab.o sos/kmalloc.o \
>> 034 sos/physmem.o sos/klibc.o \
>> 035 sos/thread.o sos/kwaitq.o \
>> 036 sos/time.o sos/sched.o sos/ksynch.o \
>> 037 sos/process.o sos/syscall.o \
>> 038 sos/assert.o sos/main.o sos/mouse_sim.o \
>> 039 sos/uaccess.o sos/calcload.o \
>> 040 sos/umem_vmm.o sos/binfmt_elf32.o \
>> 041 drivers/x86_videomem.o drivers/bochs.o \
>> 042 drivers/zero.o drivers/mem.o \
>> 043 drivers/ide.o drivers/kbd.o drivers/kbdmapfr.o \
>> 044 drivers/serial.o drivers/tty.o drivers/part.o \
>> 045 drivers/console.o \
>> 046 sos/hash.o sos/fs.o sos/fs_nscache.o \
>> 047 drivers/fs_virtfs.o sos/chardev.o sos/blkdev.o \
>> 048 sos/blkcache.o sos/fs_pagecache.o \
>> 049 userland/userprogs.kimg
012 050
013 KERNEL_OBJ = sos.elf 051 KERNEL_OBJ = sos.elf
>> 052 KERNEL_LOAD = sos.gz
014 MULTIBOOT_IMAGE = fd.img 053 MULTIBOOT_IMAGE = fd.img
015 PWD := $(shell pwd) !! 054 PWD := $(shell pwd | sed 's/"/\\\"/g;s/\$$/\\\$$/g')
016 055
017 056
018 all: $(MULTIBOOT_IMAGE) 057 all: $(MULTIBOOT_IMAGE)
019 058
020 $(MULTIBOOT_IMAGE): $(KERNEL_OBJ) !! 059 $(MULTIBOOT_IMAGE): $(KERNEL_LOAD)
021 ./support/build_image.sh $@ $< 060 ./support/build_image.sh $@ $<
022 061
>> 062 $(KERNEL_LOAD): $(KERNEL_OBJ)
>> 063 $(CP) $< $<.strip && $(STRIP) -sx -R .comment $<.strip
>> 064 gzip < $<.strip > $@
>> 065
023 $(KERNEL_OBJ): $(OBJECTS) ./support/sos.lds 066 $(KERNEL_OBJ): $(OBJECTS) ./support/sos.lds
024 $(LD) $(LDFLAGS) -T ./support/sos.lds !! 067 $(LD) $(LDFLAGS) -T ./support/sos.lds -o $@ $(OBJECTS) $(LIBGCC)
025 -nm -C $@ | cut -d ' ' -f 1,3 > sos.ma 068 -nm -C $@ | cut -d ' ' -f 1,3 > sos.map
>> 069 size $@
026 070
027 -include .mkvars 071 -include .mkvars
028 072
>> 073 # Create the userland programs to include in the kernel image
>> 074 userland/userprogs.kimg: FORCE
>> 075 $(MAKE) -C userland
>> 076
029 # Create objects from C source code 077
030 %.o: %.c 078 %.o: %.c
031 $(CC) -I$(PWD) -c $< $(CFLAGS) -o $@ !! 079 $(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -o "$@"
032 080
033 081
034 %.o: %.S 082 %.o: %.S
035 $(CC) -I$(PWD) -c $< $(CFLAGS) -DASM_S !! 083 $(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -DASM_SOURCE=1 -o "$@"
>> 084
>> 085 FORCE:
>> 086 @
036 087
037 088
038 clean: 089 clean:
039 $(RM) *.img *.o mtoolsrc *~ menu.txt * !! 090 $(RM) fd*.img *.o mtoolsrc *~ menu.txt *.elf *.bin *.strip *.map
040 $(RM) *.log *.out bochs* !! 091 $(RM) *.log *.out bochs* sos.gz
041 $(RM) bootstrap/*.o bootstrap/*~ 092 $(RM) bootstrap/*.o bootstrap/*~
042 $(RM) drivers/*.o drivers/*~ 093 $(RM) drivers/*.o drivers/*~
043 $(RM) hwcore/*.o hwcore/*~ 094 $(RM) hwcore/*.o hwcore/*~
044 $(RM) sos/*.o sos/*~ 095 $(RM) sos/*.o sos/*~
045 $(RM) support/*~ 096 $(RM) support/*~
046 $(RM) extra/*~ 097 $(RM) extra/*~
>> 098 $(MAKE) -C extra clean
>> 099 $(MAKE) -C userland clean