fix dangling pointer issues in ext2dr

[lunaix-os.git] / lunaix-os / kernel.mk

diff --git a/lunaix-os/kernel.mk b/lunaix-os/kernel.mk
index 5d645140271c724e8305e4d27b35f3e1680daca2..a0a24040ebf40e82d0449d077d19f97d44928528 100644 (file)
--- a/lunaix-os/kernel.mk
+++ b/lunaix-os/kernel.mk
@@ -1,52 +1,69 @@
-include os.mkinc
-include toolchain.mkinc
+include kbuild_deps.mkinc

 
 

-define ksrc_dirs
-       kernel
-       hal
-       libs
-       arch/$(ARCH)
-endef
+kbin_dir := $(BUILD_DIR)
+kbin := $(BUILD_NAME)

 
 

-define kinc_dirs
-       includes
-       includes/usr
-       arch/$(ARCH)/includes
-endef
+tmp_kbin  := $(BUILD_DIR)/tmpk.bin
+klinking  := link/lunaix.ld

 
 

+CFLAGS += $(kcflags) -MMD -MP
+
+all_linkable = $(filter-out $(klinking),$(1))
+
+%.S.o: %.S $(khdr_files) kernel.mk
+       $(call status,AS,$<)
+       @$(CC) $(CFLAGS) -c $< -o $@
+
+%.c.o: %.c kernel.mk
+       $(call status,CC,$<)
+       @$(CC) $(CFLAGS) -c $< -o $@

 
 

-kbin_dir := $(BUILD_DIR)
-kbin := $(BUILD_NAME)

 
 

-ksrc_files := $(foreach f, $(ksrc_dirs), $(shell find $(f) -name "*.[cS]"))
-ksrc_objs := $(addsuffix .o,$(ksrc_files))
-ksrc_deps := $(addsuffix .d,$(ksrc_files))
+$(klinking): link/lunaix.ldx
+       $(call status,PP,$<)
+       @$(CC) $(CFLAGS) -x c -E -P $< -o $@

 
 

-kinc_opts := $(addprefix -I,$(kinc_dirs))

 
 

+$(tmp_kbin): $(klinking) $(ksrc_objs)
+       $(call status,LD,$@)

 
 

-CFLAGS += -include flags.h
+       @$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $@ \
+                       $(call all_linkable,$^)

 
 

-%.S.o: %.S
-       $(call status_,AS,$<)
-       @$(CC) $(kinc_opts) -c $< -o $@
+ksymtable := lunaix_ksyms.o
+ksecsmap  := lunaix_ksecsmap.o

 
 

-%.c.o: %.c
-       $(call status_,CC,$<)
-       @$(CC) $(CFLAGS) $(kinc_opts) -c $< -o $@
+kautogen  := $(ksecsmap) $(ksymtable)

 
 

-$(kbin_dir)/modksyms: $(kbin)
-       $(call status_,GEN,$@)
-       @$(PY) scripts/syms_export.py --bits=32 --order=little -o "$@"  "$<" 
+$(ksymtable): $(tmp_kbin)
+       $(call status,KSYM,$@)
+       @ARCH=$(ARCH) scripts/gen-ksymtable DdRrTtAGg $< > lunaix_ksymtable.S
+
+       @$(CC) $(CFLAGS) -c lunaix_ksymtable.S -o $@
+
+$(ksecsmap): $(tmp_kbin)
+       $(call status,KGEN,$@)
+       @scripts/elftool.tool -p -i $< > lunaix_ksecsmap.S
+
+       @$(CC) $(CFLAGS) -c lunaix_ksecsmap.S -o $@

 
 .PHONY: __do_relink
 
 .PHONY: __do_relink

-__do_relink: $(ksrc_objs)
-       $(call status_,LD,$@)
-       @$(CC) -T link/linker.ld -o $(kbin) $(ksrc_objs) $(LDFLAGS)
+
+__do_relink: $(klinking) $(ksrc_objs) $(kautogen)
+       $(call status,LD,$(kbin))
+
+       @$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $(kbin) \
+                       $(call all_linkable,$^)
+       
+       @rm $(tmp_kbin)
+

 
 .PHONY: all
 
 .PHONY: all

-all: __do_relink $(kbin_dir)/modksyms
+all: __do_relink
+

 
 clean:
        @rm -f $(ksrc_objs)
 
 clean:
        @rm -f $(ksrc_objs)

-       @rm -f $(ksrc_deps)
\ No newline at end of file
+       @rm -f $(ksrc_deps)
+       @rm -f $(klinking)
+       @rm -f lunaix_ksymtable.S $(ksymtable)
\ No newline at end of file