Changes in kernel/Makefile [7a0359b:510bc07] in mainline

File:

• kernel/Makefile (modified) (10 diffs)

kernel/Makefile

@@ -160 +160 @@
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-        INSTRUMENTATION = -finstrument-functions
 endif
 
@@ -166 +165 @@
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-        INSTRUMENTATION = -finstrument-functions
 endif
 
@@ -172 +170 @@
         CFLAGS = $(ICC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-        INSTRUMENTATION =
 endif
 
@@ -179 +176 @@
         DEFS += $(CONFIG_DEFS)
         DEPEND_DEFS = $(DEFS)
-        INSTRUMENTATION =
 endif
 
@@ -185 +181 @@
         CFLAGS = $(CLANG_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-        INSTRUMENTATION =
 endif
 
@@ -206 +201 @@
         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 \
@@ -248 +241 @@
         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 \
@@ -300 +294 @@
                 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 \
@@ -361 +360 @@
 endif
 
-## Sources where instrumentation is enabled
-#
-
-ifeq ($(CONFIG_TRACE),y)
-        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/proc/tasklet.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
-
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
@@ -444 +419 @@
 
 %.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION)) -c -o $@ $<
+        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) -c -o $@ $<
 ifeq ($(PRECHECK),y)
         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)