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