Changeset cefb126 in mainline for kernel/Makefile

Timestamp:

2010-07-02T14:19:30Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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) (10 diffs)

kernel/Makefile

@@ -160 +160 @@
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION = -finstrument-functions
 endif
 
@@ -165 +166 @@
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION = -finstrument-functions
 endif
 
@@ -170 +172 @@
         CFLAGS = $(ICC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION =
 endif
 
@@ -176 +179 @@
         DEFS += $(CONFIG_DEFS)
         DEPEND_DEFS = $(DEFS)
+        INSTRUMENTATION =
 endif
 
@@ -181 +185 @@
         CFLAGS = $(CLANG_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+        INSTRUMENTATION =
 endif
 
@@ -201 +206 @@
         generic/src/debug/symtab.c \
         generic/src/debug/stacktrace.c \
+        generic/src/debug/panic.c \
+        generic/src/debug/debug.c \
         generic/src/interrupt/interrupt.c \
         generic/src/main/main.c \
@@ -241 +248 @@
         generic/src/synch/spinlock.c \
         generic/src/synch/condvar.c \
-        generic/src/synch/rwlock.c \
         generic/src/synch/mutex.c \
         generic/src/synch/semaphore.c \
@@ -294 +300 @@
                 test/mm/slab1.c \
                 test/mm/slab2.c \
-                test/synch/rwlock1.c \
-                test/synch/rwlock2.c \
-                test/synch/rwlock3.c \
-                test/synch/rwlock4.c \
-                test/synch/rwlock5.c \
                 test/synch/semaphore1.c \
                 test/synch/semaphore2.c \
@@ -360 +361 @@
 endif
 
+## Sources where instrumentation is enabled
+#
+
+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
+endif
+
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
@@ -419 +431 @@
 
 %.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) -c -o $@ $<
+        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION)) -c -o $@ $<
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)