Put arch-specific Cachegrind code in files in the main cachegrind/

directory, instead of subdirectories.  This is simpler and consistent
with how the rest of system is now structured.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3865

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index 9c607e6fb9af1d71a941ed9a2c8e7ecf51461e6a..e981aaf68e41040612f6d28ec74ca51285349854 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -1,12 +1,4 @@
-##include $(top_srcdir)/Makefile.tool.am
-include $(top_srcdir)/Makefile.all.am
-include $(top_srcdir)/Makefile.tool-flags.am
-include $(top_srcdir)/Makefile.tool-inplace.am
-
-SUBDIRS      = $(VG_ARCH)     . tests docs
-DIST_SUBDIRS = $(VG_ARCH_ALL) . tests docs
-
-AM_CPPFLAGS += -I$(top_srcdir)/cachegrind/$(VG_ARCH)
+include $(top_srcdir)/Makefile.tool.am
 
 bin_SCRIPTS = cg_annotate
 
@@ -16,7 +8,8 @@ noinst_HEADERS = cg_arch.h
 
 val_PROGRAMS = vgtool_cachegrind.so
 
-vgtool_cachegrind_so_SOURCES = cg_main.c
+vgtool_cachegrind_so_SOURCES = \
+       cg_main.c \
+       cg-@VG_ARCH@.c
 vgtool_cachegrind_so_LDFLAGS = -shared
-vgtool_cachegrind_so_LDADD   = ${VG_ARCH}/libcgarch.a
 

diff --git a/cachegrind/amd64/Makefile.am b/cachegrind/amd64/Makefile.am
deleted file mode 100644 (file)
index 53d27a1..0000000
--- a/cachegrind/amd64/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/Makefile.tool-flags.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/cachegrind
-
-noinst_LIBRARIES = libcgarch.a
-
-libcgarch_a_SOURCES = cg_arch.c

diff --git a/cachegrind/arm/Makefile.am b/cachegrind/arm/Makefile.am
deleted file mode 100644 (file)
index 53d27a1..0000000
--- a/cachegrind/arm/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/Makefile.tool-flags.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/cachegrind
-
-noinst_LIBRARIES = libcgarch.a
-
-libcgarch_a_SOURCES = cg_arch.c

diff --git a/cachegrind/amd64/cg_arch.c b/cachegrind/cg-amd64.c
similarity index 99%
rename from cachegrind/amd64/cg_arch.c
rename to cachegrind/cg-amd64.c
index 8d14da37c5cdbe1bd5e75e7caddebcddb9cda60e..6aa35a717d2a8740211cca087831241a70eb9dfe 100644 (file)
--- a/cachegrind/amd64/cg_arch.c
+++ b/cachegrind/cg-amd64.c
@@ -1,6 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*--- AMD64-specific definitions.                  amd64/cg_arch.c ---*/
+/*--- AMD64-specific definitions.                       cg-amd64.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*

diff --git a/cachegrind/arm/cg_arch.c b/cachegrind/cg-arm.c
similarity index 96%
rename from cachegrind/arm/cg_arch.c
rename to cachegrind/cg-arm.c
index 9800069aa3c76a49ce996c1a41630fd99b3b0395..eb1a5874c8d15a34e048a32d8a1c10da4030afd4 100644 (file)
--- a/cachegrind/arm/cg_arch.c
+++ b/cachegrind/cg-arm.c
@@ -1,6 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*--- ARM-specific definitions.                      arm/cg_arch.c ---*/
+/*--- ARM-specific definitions.                           cg-arm.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*

diff --git a/cachegrind/x86/cg_arch.c b/cachegrind/cg-x86.c
similarity index 99%
rename from cachegrind/x86/cg_arch.c
rename to cachegrind/cg-x86.c
index 36ab3a68dc42d5226a4fd7aa064cfd9b034a99cd..6ce7b603049da13ffd7cf878532e86f50b19b110 100644 (file)
--- a/cachegrind/x86/cg_arch.c
+++ b/cachegrind/cg-x86.c
@@ -1,6 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*--- x86-specific definitions.                      x86/cg_arch.c ---*/
+/*--- x86-specific definitions.                           cg-x86.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*

diff --git a/cachegrind/x86/.cvsignore b/cachegrind/x86/.cvsignore
deleted file mode 100644 (file)
index 282522d..0000000
--- a/cachegrind/x86/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

diff --git a/cachegrind/x86/Makefile.am b/cachegrind/x86/Makefile.am
deleted file mode 100644 (file)
index 53d27a1..0000000
--- a/cachegrind/x86/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/Makefile.tool-flags.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/cachegrind
-
-noinst_LIBRARIES = libcgarch.a
-
-libcgarch_a_SOURCES = cg_arch.c

diff --git a/configure.in b/configure.in
index 0aed2b8cac2b0b9206f0aaa59ba4952daa82334f..88b8d8a3b45a31e58d02ab21d08a5698c66f7aee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -444,9 +444,6 @@ AC_OUTPUT(
    memcheck/tests/x86/Makefile
    memcheck/docs/Makefile
    cachegrind/Makefile
-   cachegrind/amd64/Makefile
-   cachegrind/arm/Makefile
-   cachegrind/x86/Makefile
    cachegrind/tests/Makefile
    cachegrind/tests/amd64/Makefile
    cachegrind/tests/arm/Makefile