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