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