|
From: <sv...@va...> - 2013-09-03 15:22:31
|
mjw 2013-09-03 15:22:14 +0000 (Tue, 03 Sep 2013)
New Revision: 13528
Log:
Reuse (shared) cachegrind source files in callgrind directly.
The callgrind Makefile.am had a common sources list that included
../cachegrind/cg_arch.c. This doesn't play well with automake and
subdir-objects. Especially make distclean was broken because some
.deps files were removed multiple times.
Just include the shared source file directly into the callgrind
source file that needs it (cg_arch.c in sim.c).
Modified files:
trunk/callgrind/Makefile.am
trunk/callgrind/sim.c
Modified: trunk/callgrind/Makefile.am (+2 -2)
===================================================================
--- trunk/callgrind/Makefile.am 2013-09-03 08:39:28 +00:00 (rev 13527)
+++ trunk/callgrind/Makefile.am 2013-09-03 15:22:14 +00:00 (rev 13528)
@@ -44,9 +44,9 @@
jumps.c \
main.c \
sim.c \
- threads.c \
- ../cachegrind/cg_arch.c
+ threads.c
+# We sneakily include "cg_branchpred.c" and "cg_arch.c" from cachegrind
CALLGRIND_CFLAGS_COMMON = -I$(top_srcdir)/cachegrind
callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \
Modified: trunk/callgrind/sim.c (+1 -1)
===================================================================
--- trunk/callgrind/sim.c 2013-09-03 08:39:28 +00:00 (rev 13527)
+++ trunk/callgrind/sim.c 2013-09-03 15:22:14 +00:00 (rev 13528)
@@ -44,7 +44,7 @@
*/
/* Cache configuration */
-#include "cg_arch.h"
+#include "cg_arch.c"
/* additional structures for cache use info, separated
* according usage frequency:
|