Changeset 6843a9c in mainline for kernel/Makefile

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/Makefile (modified) (6 diffs)

kernel/Makefile

@@ -90 +90 @@
 endif
 
-DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
+DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 
 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
@@ -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
@@ -229 +217 @@
         generic/src/syscall/syscall.c \
         generic/src/syscall/copy.c \
+        generic/src/mm/km.c \
         generic/src/mm/reserve.c \
         generic/src/mm/buddy.c \
@@ -245 +234 @@
         generic/src/lib/str.c \
         generic/src/lib/elf.c \
+        generic/src/lib/ra.c \
         generic/src/lib/rd.c \
         generic/src/printf/printf_core.c \