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/i8254.o drivers/x86_videomem. !! 025 OBJECTS = bootstrap/multiboot.o \
009 sos/klibc.o sos/main.o !! 026 hwcore/idt.o hwcore/gdt.o \
>> 027 hwcore/swintr.o hwcore/swintr_wrappers.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/kbd.o drivers/kbdmapfr.o \
>> 044 drivers/tty.o drivers/serial.o drivers/console.o \
>> 045 sos/hash.o sos/fs.o sos/fs_nscache.o \
>> 046 drivers/fs_virtfs.o sos/chardev.o \
>> 047 userland/userprogs.kimg
010 048
011 KERNEL_OBJ = sos.elf 049 KERNEL_OBJ = sos.elf
>> 050 KERNEL_LOAD = sos.gz
012 MULTIBOOT_IMAGE = fd.img 051 MULTIBOOT_IMAGE = fd.img
013 PWD := $(shell pwd) !! 052 PWD := $(shell pwd | sed 's/"/\\\"/g;s/\$$/\\\$$/g')
014 053
015 054
016 all: $(MULTIBOOT_IMAGE) 055 all: $(MULTIBOOT_IMAGE)
017 056
018 $(MULTIBOOT_IMAGE): $(KERNEL_OBJ) !! 057 $(MULTIBOOT_IMAGE): $(KERNEL_LOAD)
019 ./support/build_image.sh $@ $< 058 ./support/build_image.sh $@ $<
020 059
021 $(KERNEL_OBJ): $(OBJECTS) !! 060 $(KERNEL_LOAD): $(KERNEL_OBJ)
022 $(LD) $(LDFLAGS) -T ./support/sos.lds !! 061 $(CP) $< $<.strip && $(STRIP) -sx -R .comment $<.strip
>> 062 gzip < $<.strip > $@
>> 063
>> 064 $(KERNEL_OBJ): $(OBJECTS) ./support/sos.lds
>> 065 $(LD) $(LDFLAGS) -T ./support/sos.lds -o $@ $(OBJECTS) $(LIBGCC)
023 -nm -C $@ | cut -d ' ' -f 1,3 > sos.ma 066 -nm -C $@ | cut -d ' ' -f 1,3 > sos.map
>> 067 size $@
024 068
025 -include .mkvars 069 -include .mkvars
026 070
>> 071 # Create the userland programs to include in the kernel image
>> 072 userland/userprogs.kimg: FORCE
>> 073 $(MAKE) -C userland
>> 074
027 # Create objects from C source code 075
028 %.o: %.c 076 %.o: %.c
029 $(CC) -I$(PWD) -c $< $(CFLAGS) -o $@ !! 077 $(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -o "$@"
030 078
031 079
032 %.o: %.S 080 %.o: %.S
033 $(CC) -I$(PWD) -c $< $(CFLAGS) -DASM_S !! 081 $(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -DASM_SOURCE=1 -o "$@"
>> 082
>> 083 FORCE:
>> 084 @
034 085
035 086
036 clean: 087 clean:
037 $(RM) *.img *.o mtoolsrc *~ menu.txt * !! 088 $(RM) *.img *.o mtoolsrc *~ menu.txt *.img *.elf *.bin *.strip *.map
038 $(RM) *.log *.out bochs* !! 089 $(RM) *.log *.out bochs* sos.gz
039 $(RM) bootstrap/*.o bootstrap/*~ 090 $(RM) bootstrap/*.o bootstrap/*~
040 $(RM) drivers/*.o drivers/*~ 091 $(RM) drivers/*.o drivers/*~
041 $(RM) hwcore/*.o hwcore/*~ 092 $(RM) hwcore/*.o hwcore/*~
042 $(RM) sos/*.o sos/*~ 093 $(RM) sos/*.o sos/*~
043 $(RM) support/*~ 094 $(RM) support/*~
044 $(RM) extra/*~ 095 $(RM) extra/*~
>> 096 $(MAKE) -C extra clean
>> 097 $(MAKE) -C userland clean