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 drivers/kbd.o drivers/kbdmapfr.o \
>> 044 drivers/tty.o drivers/serial.o drivers/console.o \
043 sos/hash.o sos/fs.o sos/fs_nscache.o 045 sos/hash.o sos/fs.o sos/fs_nscache.o \
044 drivers/fs_virtfs.o !! 046 drivers/fs_virtfs.o sos/chardev.o \
045 userland/userprogs.kimg 047 userland/userprogs.kimg
046 048
047 KERNEL_OBJ = sos.elf 049 KERNEL_OBJ = sos.elf
048 KERNEL_LOAD = sos.gz 050 KERNEL_LOAD = sos.gz
049 MULTIBOOT_IMAGE = fd.img 051 MULTIBOOT_IMAGE = fd.img
050 PWD := $(shell pwd) !! 052 PWD := $(shell pwd | sed 's/"/\\\"/g;s/\$$/\\\$$/g')
051 053
052 054
053 all: $(MULTIBOOT_IMAGE) 055 all: $(MULTIBOOT_IMAGE)
054 056
055 $(MULTIBOOT_IMAGE): $(KERNEL_LOAD) 057 $(MULTIBOOT_IMAGE): $(KERNEL_LOAD)
056 ./support/build_image.sh $@ $< 058 ./support/build_image.sh $@ $<
057 059
058 $(KERNEL_LOAD): $(KERNEL_OBJ) 060 $(KERNEL_LOAD): $(KERNEL_OBJ)
059 $(CP) $< $<.strip && $(STRIP) -sx $<.s !! 061 $(CP) $< $<.strip && $(STRIP) -sx -R .comment $<.strip
060 gzip < $<.strip > $@ 062 gzip < $<.strip > $@
061 063
062 $(KERNEL_OBJ): $(OBJECTS) ./support/sos.lds 064 $(KERNEL_OBJ): $(OBJECTS) ./support/sos.lds
063 $(LD) $(LDFLAGS) -T ./support/sos.lds 065 $(LD) $(LDFLAGS) -T ./support/sos.lds -o $@ $(OBJECTS) $(LIBGCC)
064 -nm -C $@ | cut -d ' ' -f 1,3 > sos.ma 066 -nm -C $@ | cut -d ' ' -f 1,3 > sos.map
065 size $@ 067 size $@
066 068
067 -include .mkvars 069 -include .mkvars
068 070
069 # Create the userland programs to include in t 071 # Create the userland programs to include in the kernel image
070 userland/userprogs.kimg: FORCE 072 userland/userprogs.kimg: FORCE
071 $(MAKE) -C userland 073 $(MAKE) -C userland
072 074
073 075
074 %.o: %.c 076 %.o: %.c
075 $(CC) -I$(PWD) -c $< $(CFLAGS) -o $@ !! 077 $(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -o "$@"
076 078
077 079
078 %.o: %.S 080 %.o: %.S
079 $(CC) -I$(PWD) -c $< $(CFLAGS) -DASM_S !! 081 $(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -DASM_SOURCE=1 -o "$@"
080 082
081 FORCE: 083 FORCE:
082 @ 084 @
083 085
084 086
085 clean: 087 clean:
086 $(RM) *.img *.o mtoolsrc *~ menu.txt * 088 $(RM) *.img *.o mtoolsrc *~ menu.txt *.img *.elf *.bin *.strip *.map
087 $(RM) *.log *.out bochs* sos.gz 089 $(RM) *.log *.out bochs* sos.gz
088 $(RM) bootstrap/*.o bootstrap/*~ 090 $(RM) bootstrap/*.o bootstrap/*~
089 $(RM) drivers/*.o drivers/*~ 091 $(RM) drivers/*.o drivers/*~
090 $(RM) hwcore/*.o hwcore/*~ 092 $(RM) hwcore/*.o hwcore/*~
091 $(RM) sos/*.o sos/*~ 093 $(RM) sos/*.o sos/*~
092 $(RM) support/*~ 094 $(RM) support/*~
093 $(RM) extra/*~ 095 $(RM) extra/*~
>> 096 $(MAKE) -C extra clean
094 $(MAKE) -C userland clean 097 $(MAKE) -C userland clean