Changeset 8b863a62 in mainline for kernel/Makefile

Timestamp:

2014-04-16T17:14:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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) (3 diffs)

kernel/Makefile

@@ -167 +167 @@
 
 ifeq ($(COMPILER),gcc_cross)
+        CFLAGS = $(GCC_CFLAGS)
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION = -finstrument-functions
+endif
+
+ifeq ($(COMPILER),gcc_helenos)
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
@@ -206 +212 @@
         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 +227 @@
         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 \