Changeset 89c57b6 in mainline for kernel/Makefile

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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) (6 diffs)

kernel/Makefile

@@ -120 +120 @@
 ifeq ($(CONFIG_LTO),y)
         GCC_CFLAGS += -flto
+endif
+
+ifeq ($(CONFIG_LINE_DEBUG),y)
+        GCC_CFLAGS += -g
+        ICC_CFLAGS += -g
+        SUNCC_CFLAGS += -g
+        CLANG_CFLAGS += -g
 endif
 
@@ -219 +226 @@
         generic/src/proc/task.c \
         generic/src/proc/the.c \
-        generic/src/proc/tasklet.c \
         generic/src/syscall/syscall.c \
         generic/src/syscall/copy.c \
@@ -233 +239 @@
         generic/src/lib/func.c \
         generic/src/lib/memstr.c \
+        generic/src/lib/memfnc.c \
         generic/src/lib/sort.c \
         generic/src/lib/str.c \
@@ -306 +313 @@
                 test/print/print3.c \
                 test/print/print4.c \
+                test/print/print5.c \
                 test/thread/thread1.c
         
@@ -365 +373 @@
 
 ifeq ($(CONFIG_TRACE),y)
-INSTRUMENTED_SOURCES = \
-        generic/src/cpu/cpu.c \
-        generic/src/main/main.c \
-        generic/src/main/kinit.c \
-        generic/src/proc/the.c
+        INSTRUMENTED_SOURCES = \
+                generic/src/adt/btree.c \
+                generic/src/cpu/cpu.c \
+                generic/src/ddi/ddi.c \
+                generic/src/interrupt/interrupt.c \
+                generic/src/main/main.c \
+                generic/src/main/kinit.c \
+                generic/src/proc/the.c \
+                generic/src/mm/frame.c \
+                generic/src/mm/page.c \
+                generic/src/mm/tlb.c \
+                generic/src/mm/as.c \
+                generic/src/mm/slab.c \
+                generic/src/sysinfo/sysinfo.c \
+                generic/src/console/kconsole.c
+else
+        INSTRUMENTED_SOURCES =
 endif
 
@@ -388 +408 @@
 
 $(DISASM): $(RAW)
+ifeq ($(CONFIG_LINE_DEBUG),y)
+        $(OBJDUMP) -d -S $< > $@
+else
         $(OBJDUMP) -d $< > $@
+endif
 
 $(RAW): $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(SYMTAB_OBJECTS)