From: Nicholas Nethercote Date: Thu, 22 Jan 2009 01:13:16 +0000 (+0000) Subject: - No longer using VG_ARCH_ALL to determine the DIST_SUBDIRS used for X-Git-Tag: svn/VALGRIND_3_5_0~1067 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cace8b55cdbf02053711f683e5ef2b08a0618e53;p=thirdparty%2Fvalgrind.git - No longer using VG_ARCH_ALL to determine the DIST_SUBDIRS used for arch/OS/platform-specific tool test dirs, instead writing it by hand. This is important because up until now if we had any arch-specific test dirs, we needed such dirs for all archs. Now that we also have OS-specific and platform-specific test dirs, we don't want to have (mostly) empty dirs for every arch/OS/platform. - Correspondingly, removed several empty directories under memcheck/tests/ and cachegrind/tests that are no longer needed. - Also removed VG_ARCH_ALL from configure.in. - Also used an arch-specific guard rather than a platform-specific one where appropriate in cachegrind/tests/Makefile.am. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9017 --- diff --git a/cachegrind/tests/Makefile.am b/cachegrind/tests/Makefile.am index e49b01cb1e..4b4806bdcf 100644 --- a/cachegrind/tests/Makefile.am +++ b/cachegrind/tests/Makefile.am @@ -3,20 +3,11 @@ include $(top_srcdir)/Makefile.flags.am SUBDIRS = . -if VGP_X86_LINUX +if VGA_X86 SUBDIRS += x86 endif -if VGP_AMD64_LINUX -SUBDIRS += amd64 -endif -if VGP_PPC32_LINUX -SUBDIRS += ppc32 -endif -if VGP_PPC64_LINUX -SUBDIRS += ppc64 -endif -DIST_SUBDIRS = ${VG_ARCH_ALL} . +DIST_SUBDIRS = x86 . noinst_SCRIPTS = filter_stderr filter_cachesim_discards diff --git a/cachegrind/tests/amd64/Makefile.am b/cachegrind/tests/amd64/Makefile.am deleted file mode 100644 index 237719404d..0000000000 --- a/cachegrind/tests/amd64/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -# if any tests appear here, remember to include @FLAG_M64@ in the -# compilation flags diff --git a/cachegrind/tests/ppc32/Makefile.am b/cachegrind/tests/ppc32/Makefile.am deleted file mode 100644 index 123b3a9916..0000000000 --- a/cachegrind/tests/ppc32/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -# if any tests appear here, remember to include @FLAG_M32@ in the -# compilation flags diff --git a/cachegrind/tests/ppc64/Makefile.am b/cachegrind/tests/ppc64/Makefile.am deleted file mode 100644 index 237719404d..0000000000 --- a/cachegrind/tests/ppc64/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -# if any tests appear here, remember to include @FLAG_M64@ in the -# compilation flags diff --git a/configure.in b/configure.in index 6cca6edee3..4bb7d108f2 100644 --- a/configure.in +++ b/configure.in @@ -143,9 +143,6 @@ AC_CANONICAL_HOST AC_MSG_CHECKING([for a supported CPU]) AC_SUBST(VG_ARCH_MAX) -AC_SUBST(VG_ARCH_ALL) -VG_ARCH_ALL="amd64 ppc32 ppc64 x86" - case "${host_cpu}" in i?86) AC_MSG_RESULT([ok (${host_cpu})]) @@ -1640,17 +1637,12 @@ AC_OUTPUT( memcheck/Makefile memcheck/tests/Makefile memcheck/tests/amd64/Makefile - memcheck/tests/ppc32/Makefile - memcheck/tests/ppc64/Makefile memcheck/tests/x86/Makefile memcheck/tests/linux/Makefile memcheck/tests/x86-linux/Makefile memcheck/docs/Makefile cachegrind/Makefile cachegrind/tests/Makefile - cachegrind/tests/amd64/Makefile - cachegrind/tests/ppc32/Makefile - cachegrind/tests/ppc64/Makefile cachegrind/tests/x86/Makefile cachegrind/docs/Makefile cachegrind/cg_annotate diff --git a/docs/internals/porting-HOWTO.txt b/docs/internals/porting-HOWTO.txt index 80dd289235..8ea1909fb5 100644 --- a/docs/internals/porting-HOWTO.txt +++ b/docs/internals/porting-HOWTO.txt @@ -17,8 +17,7 @@ To begin: thorough!) Put in Makefile.am files for them, edit them for the new architecture name. -- Update configure.in (use x86 and x86-linux as a guide). Don't forget to - update VG_ARCH_ALL, VG_PLATFORM_ALL. +- Update configure.in (use x86 and x86-linux as a guide). Once it configures ok, get it to compile: diff --git a/exp-ptrcheck/tests/Makefile.am b/exp-ptrcheck/tests/Makefile.am index 38512ab77b..73553c07be 100644 --- a/exp-ptrcheck/tests/Makefile.am +++ b/exp-ptrcheck/tests/Makefile.am @@ -3,20 +3,10 @@ include $(top_srcdir)/Makefile.flags.am #SUBDIRS = . -#if VGP_X86_LINUX +#if VGA_X86 #SUBDIRS += x86 -#endif -#if VGP_AMD64_LINUX -#SUBDIRS += amd64 -#endif -#if VGP_PPC32_LINUX -#SUBDIRS += ppc32 -#endif -#if VGP_PPC64_LINUX -#SUBDIRS += ppc64 -#endif -#DIST_SUBDIRS = ${VG_ARCH_ALL} . +#DIST_SUBDIRS = x86 . noinst_SCRIPTS = filter_stderr filter_add filter_suppgen \ sh_script diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 54cdbfc237..7b4398e1a8 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -11,12 +11,6 @@ endif if VGA_AMD64 SUBDIRS += amd64 endif -if VGA_PPC32 -SUBDIRS += ppc32 -endif -if VGA_PPC64 -SUBDIRS += ppc64 -endif # OS-specific tests if VGO_LINUX @@ -28,7 +22,7 @@ if VGP_X86_LINUX SUBDIRS += x86-linux endif -DIST_SUBDIRS = ${VG_ARCH_ALL} . +DIST_SUBDIRS = x86 amd64 linux x86-linux . noinst_SCRIPTS = filter_allocs filter_leak_check_size \ filter_stderr filter_stderr_backtrace filter_xml \ diff --git a/memcheck/tests/ppc32/Makefile.am b/memcheck/tests/ppc32/Makefile.am deleted file mode 100644 index 123b3a9916..0000000000 --- a/memcheck/tests/ppc32/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -# if any tests appear here, remember to include @FLAG_M32@ in the -# compilation flags diff --git a/memcheck/tests/ppc64/Makefile.am b/memcheck/tests/ppc64/Makefile.am deleted file mode 100644 index 237719404d..0000000000 --- a/memcheck/tests/ppc64/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -# if any tests appear here, remember to include @FLAG_M64@ in the -# compilation flags diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index 9c4662e241..5f0633720d 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -16,7 +16,7 @@ if VGA_PPC64 SUBDIRS += ppc64 endif -DIST_SUBDIRS = ${VG_ARCH_ALL} . +DIST_SUBDIRS = x86 amd64 ppc32 ppc64 . noinst_SCRIPTS = \ filter_cmdline0 filter_linenos \