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