Changeset 4c53333 in mainline for kernel/Makefile

Timestamp:

2013-07-11T08:21:10Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• kernel/Makefile (modified) (12 diffs)

kernel/Makefile

@@ -36 +36 @@
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
 COMMON_HEADER = $(ROOT_PATH)/common.h
-COMMON_HEADER_ARCH = arch/$(KARCH)/include/common.h
+COMMON_HEADER_ARCH = arch/$(KARCH)/include/arch/common.h
 
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
@@ -59 +59 @@
 REAL_MAP = generic/src/debug/real_map
 
-ABI_INCLUDE = generic/include/abi
-ARCH_INCLUDE = generic/include/arch
-GENARCH_INCLUDE = generic/include/genarch
-
 GENMAP = tools/genmap.py
 JOBFILE = $(ROOT_PATH)/tools/jobfile.py
@@ -76 +72 @@
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) arch/*/_link.ld arch/*/include/common.h
+        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 \{\} \;
 
@@ -82 +78 @@
 #
 
-INCLUDES = generic/include
+INCLUDES = generic/include genarch/include arch/$(KARCH)/include ../abi/include
+INCLUDES_FLAGS = $(addprefix -I,$(INCLUDES))
 
 ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
@@ -92 +89 @@
 DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 
-GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+GCC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
@@ -99 +96 @@
         -pipe
 
-ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+ICC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
         -Werror-implicit-function-declaration -wd170
 
-SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
-        -xnolib -xc99=all -features=extensions \
-        -erroff=E_ZERO_SIZED_STRUCT_UNION
-
-CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
-        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
-        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
+# clang does not support following options but I am not sure whether
+# something won't break because of that:
+# -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) -finput-charset=UTF-8
+CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+        -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -Wall -Werror -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
-        -pipe -arch $(CLANG_ARCH)
+        -integrated-as \
+        -pipe -target $(CLANG_TARGET)
 
 ifeq ($(CONFIG_DEBUG),y)
@@ -126 +122 @@
         GCC_CFLAGS += -g
         ICC_CFLAGS += -g
-        SUNCC_CFLAGS += -g
         CLANG_CFLAGS += -g
 endif
@@ -180 +175 @@
         CFLAGS = $(ICC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-        INSTRUMENTATION =
-endif
-
-ifeq ($(COMPILER),suncc)
-        CFLAGS = $(SUNCC_CFLAGS)
-        DEFS += $(CONFIG_DEFS)
-        DEPEND_DEFS = $(DEFS)
         INSTRUMENTATION =
 endif
@@ -208 +196 @@
         generic/src/console/chardev.c \
         generic/src/console/console.c \
+        generic/src/console/prompt.c \
         generic/src/cpu/cpu.c \
         generic/src/ddi/ddi.c \
@@ -268 +257 @@
         generic/src/ipc/ipc.c \
         generic/src/ipc/sysipc.c \
+        generic/src/ipc/sysipc_ops.c \
+        generic/src/ipc/ops/clnestab.c \
+        generic/src/ipc/ops/conctmeto.c \
+        generic/src/ipc/ops/concttome.c \
+        generic/src/ipc/ops/connclone.c \
+        generic/src/ipc/ops/dataread.c \
+        generic/src/ipc/ops/datawrite.c \
+        generic/src/ipc/ops/debug.c \
+        generic/src/ipc/ops/sharein.c \
+        generic/src/ipc/ops/shareout.c \
+        generic/src/ipc/ops/stchngath.c \
         generic/src/ipc/ipcrsc.c \
         generic/src/ipc/irq.c \
@@ -390 +390 @@
 
 $(LINK): $(LINK).in $(DEPEND)
-        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
+        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
 
 %.o: %.S $(DEPEND)
@@ -435 +435 @@
         $(GENMAP) $(MAP_PREV) $(DUMP) $@
 
-$(DEPEND): $(ABI_INCLUDE) $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(COMMON_HEADER_ARCH)
+$(DEPEND): $(COMMON_HEADER_ARCH)
         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) $@
 
-$(ABI_INCLUDE): ../abi/include/
-        ln -sfn ../../$< $@
-
-$(ARCH_INCLUDE): arch/$(KARCH)/include/
-        ln -sfn ../../$< $@
-
-$(GENARCH_INCLUDE): genarch/include/
-        ln -sfn ../../$< $@
-
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)
-        ln -sfn ../../../$< $@
+        ln -sfn ../../../../$< $@