Fix build error by adding -fno-stack-protector to CFLAGS in usr/LBuild (#63)

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

diff --git a/lunaix-os/kernel.mk b/lunaix-os/kernel.mk
index dff0de2f326750c4bc230fad7c2bbb1b624ae8ab..a0a24040ebf40e82d0449d077d19f97d44928528 100644 (file)
--- a/lunaix-os/kernel.mk
+++ b/lunaix-os/kernel.mk
@@ -1,51 +1,69 @@
-include os.mkinc
-include toolchain.mkinc
-
-include .builder/lbuild.mkinc
+include kbuild_deps.mkinc

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

-ksrc_objs := $(addsuffix .o,$(_LBUILD_SRCS))
-ksrc_deps := $(addsuffix .d,$(_LBUILD_SRCS))
-khdr_opts := $(addprefix -include ,$(_LBUILD_HDRS))
-kinc_opts := $(addprefix -I,$(_LBUILD_INCS))
-config_h += -include.builder/configs.h
-

 tmp_kbin  := $(BUILD_DIR)/tmpk.bin
 tmp_kbin  := $(BUILD_DIR)/tmpk.bin

-ksymtable := lunaix_ksyms.o
+klinking  := link/lunaix.ld

 
 

-CFLAGS += $(khdr_opts) $(kinc_opts) $(config_h) -MMD -MP
+CFLAGS += $(kcflags) -MMD -MP

 
 

--include $(ksrc_deps)
+all_linkable = $(filter-out $(klinking),$(1))

 
 %.S.o: %.S $(khdr_files) kernel.mk
 
 %.S.o: %.S $(khdr_files) kernel.mk

-       $(call status_,AS,$<)
+       $(call status,AS,$<)

        @$(CC) $(CFLAGS) -c $< -o $@
 
        @$(CC) $(CFLAGS) -c $< -o $@
 

-%.c.o: %.c $(khdr_files) kernel.mk
-       $(call status_,CC,$<)
+%.c.o: %.c kernel.mk
+       $(call status,CC,$<)

        @$(CC) $(CFLAGS) -c $< -o $@
 
        @$(CC) $(CFLAGS) -c $< -o $@
 

-$(tmp_kbin): $(ksrc_objs)
-       $(call status_,LD,$@)
-       @$(CC) -T link/linker.ld $(config_h) $(LDFLAGS) -o $@ $^
+
+$(klinking): link/lunaix.ldx
+       $(call status,PP,$<)
+       @$(CC) $(CFLAGS) -x c -E -P $< -o $@
+
+
+$(tmp_kbin): $(klinking) $(ksrc_objs)
+       $(call status,LD,$@)
+
+       @$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $@ \
+                       $(call all_linkable,$^)
+
+ksymtable := lunaix_ksyms.o
+ksecsmap  := lunaix_ksecsmap.o
+
+kautogen  := $(ksecsmap) $(ksymtable)

 
 $(ksymtable): $(tmp_kbin)
 
 $(ksymtable): $(tmp_kbin)

-       $(call status_,KSYM,$@)
-       @scripts/gen_ksymtable.sh DdRrTtAGg $< > .lunaix_ksymtable.S
-       @$(CC) $(CFLAGS) -c .lunaix_ksymtable.S -o $@
+       $(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) $(ksymtable)
-       $(call status_,LD,$(kbin))
-       @$(CC) -T link/linker.ld $(config_h) $(LDFLAGS) -o $(kbin) $^
+
+__do_relink: $(klinking) $(ksrc_objs) $(kautogen)
+       $(call status,LD,$(kbin))
+
+       @$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $(kbin) \
+                       $(call all_linkable,$^)
+       

        @rm $(tmp_kbin)
 
        @rm $(tmp_kbin)
 

+

 .PHONY: all
 all: __do_relink
 
 .PHONY: all
 all: __do_relink
 

+

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

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