Changeset 97c7682 in mainline for kernel/Makefile

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• kernel/Makefile (modified) (4 diffs)

kernel/Makefile

@@ -103 +103 @@
         -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) \
@@ -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 \