Changes in kernel/Makefile [550b4e0:072607b] in mainline

File:

• kernel/Makefile (modified) (20 diffs)

kernel/Makefile

@@ -48 +48 @@
 #
 
+AGDEPEND = Makefile.ag.depend
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
@@ -66 +67 @@
 SIZEOK_MAP = generic/src/debug/sizeok_map.o
 
-.PHONY: all clean
+.PHONY: all clean autogen_clean
 
 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(BIN) $(DISASM)
         -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
 
-clean:
+clean: autogen_clean
         rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* arch/*/_link.ld arch/*/include/arch/common.h
-        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
+        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm '{}' \;
 
 ## Common compiler flags
@@ -105 +106 @@
 CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -Wall -Werror -Wextra -Wno-unused-parameter -Wmissing-prototypes \
+        -std=gnu99 -Wall -Werror -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -integrated-as \
-        -pipe -target $(CLANG_TARGET)
+        -integrated-as -pipe -target $(CLANG_TARGET)
 
 ifeq ($(CONFIG_DEBUG),y)
@@ -129 +129 @@
 # AFLAGS and LFLAGS must be initialized before the inclusion.
 #
-AFLAGS =
-LFLAGS = -n -T $(LINK) -M
+AFLAGS = --fatal-warnings
+LFLAGS = -n -T $(LINK) -M --fatal-warnings
 
 #
@@ -139 +139 @@
 -include genarch/Makefile.inc
 -include $(DEPEND)
+-include $(AGDEPEND)
 
 ## The at-sign
@@ -172 +173 @@
 endif
 
+ifeq ($(COMPILER),gcc_helenos)
+        CFLAGS = $(GCC_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION = -finstrument-functions
+endif
+
 ifeq ($(COMPILER),icc)
         CFLAGS = $(ICC_CFLAGS)
@@ -192 +199 @@
         generic/src/adt/bitmap.c \
         generic/src/adt/btree.c \
+        generic/src/adt/cht.c \
         generic/src/adt/hash_table.c \
         generic/src/adt/list.c \
@@ -198 +206 @@
         generic/src/console/prompt.c \
         generic/src/cpu/cpu.c \
+        generic/src/cpu/cpu_mask.c \
         generic/src/ddi/ddi.c \
         generic/src/ddi/irq.c \
@@ -206 +215 @@
         generic/src/debug/debug.c \
         generic/src/interrupt/interrupt.c \
+        generic/src/log/log.c \
         generic/src/main/main.c \
         generic/src/main/kinit.c \
@@ -220 +230 @@
         generic/src/mm/km.c \
         generic/src/mm/reserve.c \
-        generic/src/mm/buddy.c \
         generic/src/mm/frame.c \
         generic/src/mm/page.c \
@@ -228 +237 @@
         generic/src/mm/backend_elf.c \
         generic/src/mm/backend_phys.c \
+        generic/src/mm/backend_user.c \
         generic/src/mm/slab.c \
         generic/src/lib/func.c \
@@ -251 +261 @@
         generic/src/synch/semaphore.c \
         generic/src/synch/smc.c \
+        generic/src/synch/smp_memory_barrier.c \
         generic/src/synch/waitq.c \
         generic/src/synch/futex.c \
+        generic/src/synch/workqueue.c \
+        generic/src/synch/rcu.c \
         generic/src/smp/ipi.c \
         generic/src/smp/smp.c \
+        generic/src/smp/smp_call.c \
         generic/src/ipc/ipc.c \
         generic/src/ipc/sysipc.c \
@@ -265 +279 @@
         generic/src/ipc/ops/datawrite.c \
         generic/src/ipc/ops/debug.c \
+        generic/src/ipc/ops/pagein.c \
         generic/src/ipc/ops/sharein.c \
         generic/src/ipc/ops/shareout.c \
@@ -304 +319 @@
                 test/atomic/atomic1.c \
                 test/btree/btree1.c \
+                test/cht/cht1.c \
                 test/avltree/avltree1.c \
                 test/fault/fault1.c \
@@ -313 +329 @@
                 test/synch/semaphore1.c \
                 test/synch/semaphore2.c \
+                test/synch/workqueue2.c \
+                test/synch/workqueue3.c \
+                test/synch/rcu1.c \
                 test/print/print1.c \
                 test/print/print2.c \
@@ -318 +337 @@
                 test/print/print4.c \
                 test/print/print5.c \
-                test/thread/thread1.c
+                test/thread/thread1.c \
+                test/smpcall/smpcall1.c
         
         ifeq ($(KARCH),mips32)
@@ -361 +381 @@
 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
 
+GENARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(GENARCH_AUTOGENS_AG)))
+GENARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(GENARCH_AUTOGENS_AG)))
+GENARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(GENARCH_AUTOGENS_AG)))
+
+ARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(ARCH_AUTOGENS_AG)))
+ARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(ARCH_AUTOGENS_AG)))
+ARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(ARCH_AUTOGENS_AG)))
+
+AUTOGENS_H := $(ARCH_AUTOGENS_H) $(GENARCH_AUTOGENS_H)
+AUTOGENS_AG := $(ARCH_AUTOGENS_AG) $(GENARCH_AUTOGENS_AG)
+
 LFLAGS_LTO := $(addprefix -Xlinker ,$(LFLAGS))
 
@@ -391 +422 @@
 $(LINK): $(LINK).in $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
+
+%.h: %.ag
+        $(AUTOGEN) probe $< >$<.probe.c
+        $(CC) $(DEFS) $(CFLAGS) -S -o $<.probe.s $<.probe.c
+        $(AUTOGEN) generate $< <$<.probe.s >$@   
 
 %.o: %.S $(DEPEND)
@@ -435 +471 @@
         $(GENMAP) $(MAP_PREV) $(DUMP) $@
 
-$(DEPEND): $(COMMON_HEADER_ARCH)
+$(AUTOGENS_H): $(AGDEPEND)
+
+$(AGDEPEND): $(AUTOGENS_AG)
+        echo "# DO NOT EDIT" >$@
+        for g in $^; do \
+                h=`dirname $$g`/`basename $$g .ag`.h; \
+                for l in `$(AUTOGEN) depend $$g`; do \
+                        echo "$$h: $$l" >>$@; \
+                done \
+        done
+
+$(DEPEND): $(COMMON_HEADER_ARCH) $(AUTOGENS_H)
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
@@ -441 +488 @@
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)
         ln -sfn ../../../../$< $@
+
+autogen_clean:
+        -rm $(ARCH_AUTOGENS_H) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)
+        -rm $(GENARCH_AUTOGENS_H) $(GENARCH_AUTOGENS_PROBE_C) $(GENARCH_AUTOGENS_PROBE_S)
+        -rm $(AGDEPEND)