From: Bart Van Assche Date: Fri, 4 Jul 2008 15:14:35 +0000 (+0000) Subject: Renamed exp-drd directory into drd. Moved drd from the experimental tool class to... X-Git-Tag: svn/VALGRIND_3_4_0~372 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e368a9f37adbf18076f2c12117cbf5047ab658c;p=thirdparty%2Fvalgrind.git Renamed exp-drd directory into drd. Moved drd from the experimental tool class to the class of regular tools. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8361 --- diff --git a/Makefile.am b/Makefile.am index aa644d3ac7..0542488e5d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,10 +9,10 @@ TOOLS = memcheck \ massif \ lackey \ none \ - helgrind + helgrind \ + drd -EXP_TOOLS = exp-omega \ - exp-drd +EXP_TOOLS = exp-omega # Put docs last because building the HTML is slow and we want to get # everything else working before we try it. diff --git a/README_PACKAGERS b/README_PACKAGERS index 519d147256..752ac02e3d 100644 --- a/README_PACKAGERS +++ b/README_PACKAGERS @@ -78,7 +78,7 @@ Valgrind. The following notes may save you some trouble. -- Don't strip symbols from lib/valgrind/$platform/{cachegrind, - callgrind,exp-drd,exp-omega,helgrind,lackey,massif,memcheck,none} + callgrind,drd,exp-omega,helgrind,lackey,massif,memcheck,none} in the installation tree. Doing so will likely cause problems. Removing the line number info is probably OK, although that has not been tested by the Valgrind developers. diff --git a/configure.in b/configure.in index 52857e6eab..60180bd40b 100644 --- a/configure.in +++ b/configure.in @@ -1431,10 +1431,10 @@ AC_OUTPUT( exp-omega/Makefile exp-omega/tests/Makefile exp-omega/docs/Makefile - exp-drd/Makefile - exp-drd/docs/Makefile - exp-drd/scripts/download-and-build-splash2 - exp-drd/tests/Makefile + drd/Makefile + drd/docs/Makefile + drd/scripts/download-and-build-splash2 + drd/tests/Makefile ) cat< - diff --git a/drd/Makefile.am b/drd/Makefile.am new file mode 100644 index 0000000000..20a76656c7 --- /dev/null +++ b/drd/Makefile.am @@ -0,0 +1,165 @@ +include $(top_srcdir)/Makefile.tool.am + +noinst_PROGRAMS = +if VGP_X86_LINUX + noinst_PROGRAMS += drd-x86-linux vgpreload_drd-x86-linux.so +endif +if VGP_AMD64_LINUX + noinst_PROGRAMS += drd-amd64-linux vgpreload_drd-amd64-linux.so +endif +if VGP_PPC32_LINUX + noinst_PROGRAMS += drd-ppc32-linux vgpreload_drd-ppc32-linux.so +endif +if VGP_PPC64_LINUX + noinst_PROGRAMS += drd-ppc64-linux vgpreload_drd-ppc64-linux.so +endif +if VGP_PPC32_AIX5 + noinst_PROGRAMS += drd-ppc32-aix5 vgpreload_drd-ppc32-aix5.so +endif +if VGP_PPC64_AIX5 + noinst_PROGRAMS += drd-ppc64-aix5 vgpreload_drd-ppc64-aix5.so +endif + +if HAVE_OPENMP +VGPRELOAD_DRD_SOURCES_COMMON = \ + drd_strmem_intercepts.c drd_pthread_intercepts.c drd_gomp_intercepts.c +else +VGPRELOAD_DRD_SOURCES_COMMON = drd_strmem_intercepts.c drd_pthread_intercepts.c +endif + +DRD_CFLAGS=@FLAG_W_EXTRA@ @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@ \ + -Wno-inline -Wno-unused-parameter \ + -O2 -DCHECK_FORMAT_STRINGS + +AM_CFLAGS_X86_LINUX += $(DRD_CFLAGS) +AM_CFLAGS_AMD64_LINUX += $(DRD_CFLAGS) +AM_CFLAGS_PPC32_LINUX += $(DRD_CFLAGS) +AM_CFLAGS_PPC64_LINUX += $(DRD_CFLAGS) +AM_CFLAGS_PPC32_AIX5 += $(DRD_CFLAGS) +AM_CFLAGS_PPC64_AIX5 += $(DRD_CFLAGS) + +vgpreload_drd_x86_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) +vgpreload_drd_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) +vgpreload_drd_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) +vgpreload_drd_x86_linux_so_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) +vgpreload_drd_x86_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_LINUX) +vgpreload_drd_x86_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_X86_LINUX)\ + $(LIBREPLACEMALLOC_LDFLAGS_X86_LINUX) + +vgpreload_drd_amd64_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) +vgpreload_drd_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) +vgpreload_drd_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_drd_amd64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) +vgpreload_drd_amd64_linux_so_DEPENDENCIES = +vgpreload_drd_amd64_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_AMD64_LINUX)\ + $(LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX) + +vgpreload_drd_ppc32_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) +vgpreload_drd_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) +vgpreload_drd_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) +vgpreload_drd_ppc32_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) +vgpreload_drd_ppc32_linux_so_DEPENDENCIES = +vgpreload_drd_ppc32_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC32_LINUX)\ + $(LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX) + +vgpreload_drd_ppc64_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) +vgpreload_drd_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) +vgpreload_drd_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_drd_ppc64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) +vgpreload_drd_ppc64_linux_so_DEPENDENCIES = +vgpreload_drd_ppc64_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC64_LINUX)\ + $(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX) + +vgpreload_drd_ppc32_aix5_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) +vgpreload_drd_ppc32_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) +vgpreload_drd_ppc32_aix5_so_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) +vgpreload_drd_ppc32_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) +vgpreload_drd_ppc32_aix5_so_DEPENDENCIES = +vgpreload_drd_ppc32_aix5_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC32_AIX5)\ + $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5) + +vgpreload_drd_ppc64_aix5_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) +vgpreload_drd_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) +vgpreload_drd_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) +vgpreload_drd_ppc64_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) +vgpreload_drd_ppc64_aix5_so_DEPENDENCIES = +vgpreload_drd_ppc64_aix5_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC64_AIX5)\ + $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5) + + +DRD_SOURCES_COMMON = \ + drd_barrier.c \ + drd_clientobj.c \ + drd_clientreq.c \ + drd_cond.c \ + drd_error.c \ + drd_main.c \ + drd_malloc_wrappers.c \ + drd_mutex.c \ + drd_rwlock.c \ + drd_semaphore.c \ + drd_suppression.c + +drdincludedir = $(includedir)/valgrind + +drdinclude_HEADERS = drd.h + +noinst_HEADERS = \ + drd_barrier.h \ + drd_bitmap.h \ + drd_clientobj.h \ + drd_clientreq.h \ + drd_cond.h \ + drd_error.h \ + drd_malloc_wrappers.h \ + drd_mutex.h \ + drd_rwlock.h \ + drd_segment.h \ + drd_semaphore.h \ + drd_suppression.h \ + drd_thread.h \ + drd_track.h \ + drd_vc.h \ + pub_drd_bitmap.h + +drd_x86_linux_SOURCES = $(DRD_SOURCES_COMMON) +drd_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) +drd_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) +drd_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) +drd_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) +drd_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) + +drd_amd64_linux_SOURCES = $(DRD_SOURCES_COMMON) +drd_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) +drd_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) +drd_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) +drd_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) +drd_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) + +drd_ppc32_linux_SOURCES = $(DRD_SOURCES_COMMON) +drd_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) +drd_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) +drd_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) +drd_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) +drd_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) + +drd_ppc64_linux_SOURCES = $(DRD_SOURCES_COMMON) +drd_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) +drd_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) +drd_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) +drd_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) +drd_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) + +drd_ppc32_aix5_SOURCES = $(DRD_SOURCES_COMMON) +drd_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) +drd_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) +drd_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) +drd_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) +drd_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) + +drd_ppc64_aix5_SOURCES = $(DRD_SOURCES_COMMON) +drd_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) +drd_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) +drd_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) +drd_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) +drd_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5) diff --git a/exp-drd/TODO.txt b/drd/TODO.txt similarity index 100% rename from exp-drd/TODO.txt rename to drd/TODO.txt diff --git a/exp-drd/Testing.txt b/drd/Testing.txt similarity index 100% rename from exp-drd/Testing.txt rename to drd/Testing.txt diff --git a/exp-drd/docs/Makefile.am b/drd/docs/Makefile.am similarity index 100% rename from exp-drd/docs/Makefile.am rename to drd/docs/Makefile.am diff --git a/exp-drd/docs/drd-manual.xml b/drd/docs/drd-manual.xml similarity index 100% rename from exp-drd/docs/drd-manual.xml rename to drd/docs/drd-manual.xml diff --git a/exp-drd/drd.h b/drd/drd.h similarity index 100% rename from exp-drd/drd.h rename to drd/drd.h diff --git a/exp-drd/drd_barrier.c b/drd/drd_barrier.c similarity index 100% rename from exp-drd/drd_barrier.c rename to drd/drd_barrier.c diff --git a/exp-drd/drd_barrier.h b/drd/drd_barrier.h similarity index 100% rename from exp-drd/drd_barrier.h rename to drd/drd_barrier.h diff --git a/exp-drd/drd_bitmap.c b/drd/drd_bitmap.c similarity index 100% rename from exp-drd/drd_bitmap.c rename to drd/drd_bitmap.c diff --git a/exp-drd/drd_bitmap.h b/drd/drd_bitmap.h similarity index 100% rename from exp-drd/drd_bitmap.h rename to drd/drd_bitmap.h diff --git a/exp-drd/drd_clientobj.c b/drd/drd_clientobj.c similarity index 100% rename from exp-drd/drd_clientobj.c rename to drd/drd_clientobj.c diff --git a/exp-drd/drd_clientobj.h b/drd/drd_clientobj.h similarity index 100% rename from exp-drd/drd_clientobj.h rename to drd/drd_clientobj.h diff --git a/exp-drd/drd_clientreq.c b/drd/drd_clientreq.c similarity index 100% rename from exp-drd/drd_clientreq.c rename to drd/drd_clientreq.c diff --git a/exp-drd/drd_clientreq.h b/drd/drd_clientreq.h similarity index 100% rename from exp-drd/drd_clientreq.h rename to drd/drd_clientreq.h diff --git a/exp-drd/drd_cond.c b/drd/drd_cond.c similarity index 100% rename from exp-drd/drd_cond.c rename to drd/drd_cond.c diff --git a/exp-drd/drd_cond.h b/drd/drd_cond.h similarity index 100% rename from exp-drd/drd_cond.h rename to drd/drd_cond.h diff --git a/exp-drd/drd_error.c b/drd/drd_error.c similarity index 100% rename from exp-drd/drd_error.c rename to drd/drd_error.c diff --git a/exp-drd/drd_error.h b/drd/drd_error.h similarity index 100% rename from exp-drd/drd_error.h rename to drd/drd_error.h diff --git a/exp-drd/drd_gomp_intercepts.c b/drd/drd_gomp_intercepts.c similarity index 100% rename from exp-drd/drd_gomp_intercepts.c rename to drd/drd_gomp_intercepts.c diff --git a/exp-drd/drd_main.c b/drd/drd_main.c similarity index 100% rename from exp-drd/drd_main.c rename to drd/drd_main.c diff --git a/exp-drd/drd_malloc_wrappers.c b/drd/drd_malloc_wrappers.c similarity index 100% rename from exp-drd/drd_malloc_wrappers.c rename to drd/drd_malloc_wrappers.c diff --git a/exp-drd/drd_malloc_wrappers.h b/drd/drd_malloc_wrappers.h similarity index 100% rename from exp-drd/drd_malloc_wrappers.h rename to drd/drd_malloc_wrappers.h diff --git a/exp-drd/drd_mutex.c b/drd/drd_mutex.c similarity index 100% rename from exp-drd/drd_mutex.c rename to drd/drd_mutex.c diff --git a/exp-drd/drd_mutex.h b/drd/drd_mutex.h similarity index 100% rename from exp-drd/drd_mutex.h rename to drd/drd_mutex.h diff --git a/exp-drd/drd_pthread_intercepts.c b/drd/drd_pthread_intercepts.c similarity index 100% rename from exp-drd/drd_pthread_intercepts.c rename to drd/drd_pthread_intercepts.c diff --git a/exp-drd/drd_rwlock.c b/drd/drd_rwlock.c similarity index 100% rename from exp-drd/drd_rwlock.c rename to drd/drd_rwlock.c diff --git a/exp-drd/drd_rwlock.h b/drd/drd_rwlock.h similarity index 100% rename from exp-drd/drd_rwlock.h rename to drd/drd_rwlock.h diff --git a/exp-drd/drd_segment.c b/drd/drd_segment.c similarity index 100% rename from exp-drd/drd_segment.c rename to drd/drd_segment.c diff --git a/exp-drd/drd_segment.h b/drd/drd_segment.h similarity index 100% rename from exp-drd/drd_segment.h rename to drd/drd_segment.h diff --git a/exp-drd/drd_semaphore.c b/drd/drd_semaphore.c similarity index 100% rename from exp-drd/drd_semaphore.c rename to drd/drd_semaphore.c diff --git a/exp-drd/drd_semaphore.h b/drd/drd_semaphore.h similarity index 100% rename from exp-drd/drd_semaphore.h rename to drd/drd_semaphore.h diff --git a/exp-drd/drd_strmem_intercepts.c b/drd/drd_strmem_intercepts.c similarity index 100% rename from exp-drd/drd_strmem_intercepts.c rename to drd/drd_strmem_intercepts.c diff --git a/exp-drd/drd_suppression.c b/drd/drd_suppression.c similarity index 100% rename from exp-drd/drd_suppression.c rename to drd/drd_suppression.c diff --git a/exp-drd/drd_suppression.h b/drd/drd_suppression.h similarity index 100% rename from exp-drd/drd_suppression.h rename to drd/drd_suppression.h diff --git a/exp-drd/drd_thread.c b/drd/drd_thread.c similarity index 100% rename from exp-drd/drd_thread.c rename to drd/drd_thread.c diff --git a/exp-drd/drd_thread.h b/drd/drd_thread.h similarity index 100% rename from exp-drd/drd_thread.h rename to drd/drd_thread.h diff --git a/exp-drd/drd_thread_bitmap.h b/drd/drd_thread_bitmap.h similarity index 100% rename from exp-drd/drd_thread_bitmap.h rename to drd/drd_thread_bitmap.h diff --git a/exp-drd/drd_track.h b/drd/drd_track.h similarity index 100% rename from exp-drd/drd_track.h rename to drd/drd_track.h diff --git a/exp-drd/drd_vc.c b/drd/drd_vc.c similarity index 100% rename from exp-drd/drd_vc.c rename to drd/drd_vc.c diff --git a/exp-drd/drd_vc.h b/drd/drd_vc.h similarity index 100% rename from exp-drd/drd_vc.h rename to drd/drd_vc.h diff --git a/exp-drd/pub_drd_bitmap.h b/drd/pub_drd_bitmap.h similarity index 100% rename from exp-drd/pub_drd_bitmap.h rename to drd/pub_drd_bitmap.h diff --git a/exp-drd/scripts/download-and-build-firefox b/drd/scripts/download-and-build-firefox similarity index 100% rename from exp-drd/scripts/download-and-build-firefox rename to drd/scripts/download-and-build-firefox diff --git a/exp-drd/scripts/download-and-build-gcc b/drd/scripts/download-and-build-gcc similarity index 100% rename from exp-drd/scripts/download-and-build-gcc rename to drd/scripts/download-and-build-gcc diff --git a/exp-drd/scripts/download-and-build-splash2.in b/drd/scripts/download-and-build-splash2.in similarity index 100% rename from exp-drd/scripts/download-and-build-splash2.in rename to drd/scripts/download-and-build-splash2.in diff --git a/exp-drd/scripts/measurement-functions b/drd/scripts/measurement-functions similarity index 100% rename from exp-drd/scripts/measurement-functions rename to drd/scripts/measurement-functions diff --git a/exp-drd/scripts/run-matinv b/drd/scripts/run-matinv similarity index 100% rename from exp-drd/scripts/run-matinv rename to drd/scripts/run-matinv diff --git a/exp-drd/scripts/run-splash2 b/drd/scripts/run-splash2 similarity index 100% rename from exp-drd/scripts/run-splash2 rename to drd/scripts/run-splash2 diff --git a/exp-drd/scripts/run-splash2-water-input b/drd/scripts/run-splash2-water-input similarity index 100% rename from exp-drd/scripts/run-splash2-water-input rename to drd/scripts/run-splash2-water-input diff --git a/exp-drd/tests/Makefile.am b/drd/tests/Makefile.am similarity index 100% rename from exp-drd/tests/Makefile.am rename to drd/tests/Makefile.am diff --git a/exp-drd/tests/drd_bitmap_test.c b/drd/tests/drd_bitmap_test.c similarity index 99% rename from exp-drd/tests/drd_bitmap_test.c rename to drd/tests/drd_bitmap_test.c index ab7ebf287f..d2855ad6b4 100644 --- a/exp-drd/tests/drd_bitmap_test.c +++ b/drd/tests/drd_bitmap_test.c @@ -4,8 +4,8 @@ #include #include #include "coregrind/m_oset.c" -#include "exp-drd/drd_bitmap.c" -#include "exp-drd/pub_drd_bitmap.h" +#include "drd/drd_bitmap.c" +#include "drd/pub_drd_bitmap.h" /* Replacements for core functionality. */ diff --git a/exp-drd/tests/drd_bitmap_test.stderr.exp b/drd/tests/drd_bitmap_test.stderr.exp similarity index 100% rename from exp-drd/tests/drd_bitmap_test.stderr.exp rename to drd/tests/drd_bitmap_test.stderr.exp diff --git a/exp-drd/tests/drd_bitmap_test.stdout.exp b/drd/tests/drd_bitmap_test.stdout.exp similarity index 100% rename from exp-drd/tests/drd_bitmap_test.stdout.exp rename to drd/tests/drd_bitmap_test.stdout.exp diff --git a/exp-drd/tests/drd_bitmap_test.vgtest b/drd/tests/drd_bitmap_test.vgtest similarity index 100% rename from exp-drd/tests/drd_bitmap_test.vgtest rename to drd/tests/drd_bitmap_test.vgtest diff --git a/exp-drd/tests/filter_cmdline0 b/drd/tests/filter_cmdline0 similarity index 100% rename from exp-drd/tests/filter_cmdline0 rename to drd/tests/filter_cmdline0 diff --git a/exp-drd/tests/filter_error_summary b/drd/tests/filter_error_summary similarity index 100% rename from exp-drd/tests/filter_error_summary rename to drd/tests/filter_error_summary diff --git a/exp-drd/tests/filter_fdleak b/drd/tests/filter_fdleak similarity index 100% rename from exp-drd/tests/filter_fdleak rename to drd/tests/filter_fdleak diff --git a/exp-drd/tests/filter_linenos b/drd/tests/filter_linenos similarity index 100% rename from exp-drd/tests/filter_linenos rename to drd/tests/filter_linenos diff --git a/exp-drd/tests/filter_none_discards b/drd/tests/filter_none_discards similarity index 100% rename from exp-drd/tests/filter_none_discards rename to drd/tests/filter_none_discards diff --git a/exp-drd/tests/filter_stderr b/drd/tests/filter_stderr similarity index 100% rename from exp-drd/tests/filter_stderr rename to drd/tests/filter_stderr diff --git a/exp-drd/tests/fp_race.c b/drd/tests/fp_race.c similarity index 100% rename from exp-drd/tests/fp_race.c rename to drd/tests/fp_race.c diff --git a/exp-drd/tests/fp_race.stderr.exp b/drd/tests/fp_race.stderr.exp similarity index 100% rename from exp-drd/tests/fp_race.stderr.exp rename to drd/tests/fp_race.stderr.exp diff --git a/exp-drd/tests/fp_race.vgtest b/drd/tests/fp_race.vgtest similarity index 100% rename from exp-drd/tests/fp_race.vgtest rename to drd/tests/fp_race.vgtest diff --git a/exp-drd/tests/fp_race2.stderr.exp b/drd/tests/fp_race2.stderr.exp similarity index 100% rename from exp-drd/tests/fp_race2.stderr.exp rename to drd/tests/fp_race2.stderr.exp diff --git a/exp-drd/tests/fp_race2.vgtest b/drd/tests/fp_race2.vgtest similarity index 100% rename from exp-drd/tests/fp_race2.vgtest rename to drd/tests/fp_race2.vgtest diff --git a/exp-drd/tests/hg01_all_ok.stderr.exp b/drd/tests/hg01_all_ok.stderr.exp similarity index 100% rename from exp-drd/tests/hg01_all_ok.stderr.exp rename to drd/tests/hg01_all_ok.stderr.exp diff --git a/exp-drd/tests/hg01_all_ok.vgtest b/drd/tests/hg01_all_ok.vgtest similarity index 100% rename from exp-drd/tests/hg01_all_ok.vgtest rename to drd/tests/hg01_all_ok.vgtest diff --git a/exp-drd/tests/hg02_deadlock.stderr.exp b/drd/tests/hg02_deadlock.stderr.exp similarity index 100% rename from exp-drd/tests/hg02_deadlock.stderr.exp rename to drd/tests/hg02_deadlock.stderr.exp diff --git a/exp-drd/tests/hg02_deadlock.vgtest b/drd/tests/hg02_deadlock.vgtest similarity index 100% rename from exp-drd/tests/hg02_deadlock.vgtest rename to drd/tests/hg02_deadlock.vgtest diff --git a/exp-drd/tests/hg03_inherit.stderr.exp b/drd/tests/hg03_inherit.stderr.exp similarity index 100% rename from exp-drd/tests/hg03_inherit.stderr.exp rename to drd/tests/hg03_inherit.stderr.exp diff --git a/exp-drd/tests/hg03_inherit.vgtest b/drd/tests/hg03_inherit.vgtest similarity index 100% rename from exp-drd/tests/hg03_inherit.vgtest rename to drd/tests/hg03_inherit.vgtest diff --git a/exp-drd/tests/hg04_race.stderr.exp b/drd/tests/hg04_race.stderr.exp similarity index 100% rename from exp-drd/tests/hg04_race.stderr.exp rename to drd/tests/hg04_race.stderr.exp diff --git a/exp-drd/tests/hg04_race.vgtest b/drd/tests/hg04_race.vgtest similarity index 100% rename from exp-drd/tests/hg04_race.vgtest rename to drd/tests/hg04_race.vgtest diff --git a/exp-drd/tests/hg05_race2.stderr.exp b/drd/tests/hg05_race2.stderr.exp similarity index 100% rename from exp-drd/tests/hg05_race2.stderr.exp rename to drd/tests/hg05_race2.stderr.exp diff --git a/exp-drd/tests/hg05_race2.stderr.exp-powerpc b/drd/tests/hg05_race2.stderr.exp-powerpc similarity index 100% rename from exp-drd/tests/hg05_race2.stderr.exp-powerpc rename to drd/tests/hg05_race2.stderr.exp-powerpc diff --git a/exp-drd/tests/hg05_race2.vgtest b/drd/tests/hg05_race2.vgtest similarity index 100% rename from exp-drd/tests/hg05_race2.vgtest rename to drd/tests/hg05_race2.vgtest diff --git a/exp-drd/tests/hg06_readshared.stderr.exp b/drd/tests/hg06_readshared.stderr.exp similarity index 100% rename from exp-drd/tests/hg06_readshared.stderr.exp rename to drd/tests/hg06_readshared.stderr.exp diff --git a/exp-drd/tests/hg06_readshared.vgtest b/drd/tests/hg06_readshared.vgtest similarity index 100% rename from exp-drd/tests/hg06_readshared.vgtest rename to drd/tests/hg06_readshared.vgtest diff --git a/exp-drd/tests/hold_lock.c b/drd/tests/hold_lock.c similarity index 100% rename from exp-drd/tests/hold_lock.c rename to drd/tests/hold_lock.c diff --git a/exp-drd/tests/hold_lock_1.stderr.exp b/drd/tests/hold_lock_1.stderr.exp similarity index 100% rename from exp-drd/tests/hold_lock_1.stderr.exp rename to drd/tests/hold_lock_1.stderr.exp diff --git a/exp-drd/tests/hold_lock_1.vgtest b/drd/tests/hold_lock_1.vgtest similarity index 100% rename from exp-drd/tests/hold_lock_1.vgtest rename to drd/tests/hold_lock_1.vgtest diff --git a/exp-drd/tests/hold_lock_2.stderr.exp b/drd/tests/hold_lock_2.stderr.exp similarity index 100% rename from exp-drd/tests/hold_lock_2.stderr.exp rename to drd/tests/hold_lock_2.stderr.exp diff --git a/exp-drd/tests/hold_lock_2.vgtest b/drd/tests/hold_lock_2.vgtest similarity index 100% rename from exp-drd/tests/hold_lock_2.vgtest rename to drd/tests/hold_lock_2.vgtest diff --git a/exp-drd/tests/linuxthreads_det.c b/drd/tests/linuxthreads_det.c similarity index 100% rename from exp-drd/tests/linuxthreads_det.c rename to drd/tests/linuxthreads_det.c diff --git a/exp-drd/tests/linuxthreads_det.stderr.exp b/drd/tests/linuxthreads_det.stderr.exp similarity index 100% rename from exp-drd/tests/linuxthreads_det.stderr.exp rename to drd/tests/linuxthreads_det.stderr.exp diff --git a/exp-drd/tests/linuxthreads_det.stderr.exp-linuxthreads b/drd/tests/linuxthreads_det.stderr.exp-linuxthreads similarity index 100% rename from exp-drd/tests/linuxthreads_det.stderr.exp-linuxthreads rename to drd/tests/linuxthreads_det.stderr.exp-linuxthreads diff --git a/exp-drd/tests/linuxthreads_det.stdout.exp b/drd/tests/linuxthreads_det.stdout.exp similarity index 100% rename from exp-drd/tests/linuxthreads_det.stdout.exp rename to drd/tests/linuxthreads_det.stdout.exp diff --git a/exp-drd/tests/linuxthreads_det.stdout.exp-linuxthreads b/drd/tests/linuxthreads_det.stdout.exp-linuxthreads similarity index 100% rename from exp-drd/tests/linuxthreads_det.stdout.exp-linuxthreads rename to drd/tests/linuxthreads_det.stdout.exp-linuxthreads diff --git a/exp-drd/tests/linuxthreads_det.vgtest b/drd/tests/linuxthreads_det.vgtest similarity index 100% rename from exp-drd/tests/linuxthreads_det.vgtest rename to drd/tests/linuxthreads_det.vgtest diff --git a/exp-drd/tests/matinv.c b/drd/tests/matinv.c similarity index 100% rename from exp-drd/tests/matinv.c rename to drd/tests/matinv.c diff --git a/exp-drd/tests/matinv.stderr.exp b/drd/tests/matinv.stderr.exp similarity index 100% rename from exp-drd/tests/matinv.stderr.exp rename to drd/tests/matinv.stderr.exp diff --git a/exp-drd/tests/matinv.stdout.exp b/drd/tests/matinv.stdout.exp similarity index 100% rename from exp-drd/tests/matinv.stdout.exp rename to drd/tests/matinv.stdout.exp diff --git a/exp-drd/tests/matinv.vgtest b/drd/tests/matinv.vgtest similarity index 100% rename from exp-drd/tests/matinv.vgtest rename to drd/tests/matinv.vgtest diff --git a/exp-drd/tests/memory_allocation.c b/drd/tests/memory_allocation.c similarity index 100% rename from exp-drd/tests/memory_allocation.c rename to drd/tests/memory_allocation.c diff --git a/exp-drd/tests/memory_allocation.stderr.exp b/drd/tests/memory_allocation.stderr.exp similarity index 100% rename from exp-drd/tests/memory_allocation.stderr.exp rename to drd/tests/memory_allocation.stderr.exp diff --git a/exp-drd/tests/memory_allocation.vgtest b/drd/tests/memory_allocation.vgtest similarity index 100% rename from exp-drd/tests/memory_allocation.vgtest rename to drd/tests/memory_allocation.vgtest diff --git a/exp-drd/tests/new_delete.cpp b/drd/tests/new_delete.cpp similarity index 100% rename from exp-drd/tests/new_delete.cpp rename to drd/tests/new_delete.cpp diff --git a/exp-drd/tests/new_delete.stderr.exp b/drd/tests/new_delete.stderr.exp similarity index 100% rename from exp-drd/tests/new_delete.stderr.exp rename to drd/tests/new_delete.stderr.exp diff --git a/exp-drd/tests/new_delete.vgtest b/drd/tests/new_delete.vgtest similarity index 100% rename from exp-drd/tests/new_delete.vgtest rename to drd/tests/new_delete.vgtest diff --git a/exp-drd/tests/omp_matinv.c b/drd/tests/omp_matinv.c similarity index 100% rename from exp-drd/tests/omp_matinv.c rename to drd/tests/omp_matinv.c diff --git a/exp-drd/tests/omp_matinv.stderr.exp b/drd/tests/omp_matinv.stderr.exp similarity index 100% rename from exp-drd/tests/omp_matinv.stderr.exp rename to drd/tests/omp_matinv.stderr.exp diff --git a/exp-drd/tests/omp_matinv.stdout.exp b/drd/tests/omp_matinv.stdout.exp similarity index 100% rename from exp-drd/tests/omp_matinv.stdout.exp rename to drd/tests/omp_matinv.stdout.exp diff --git a/exp-drd/tests/omp_matinv.vgtest b/drd/tests/omp_matinv.vgtest similarity index 100% rename from exp-drd/tests/omp_matinv.vgtest rename to drd/tests/omp_matinv.vgtest diff --git a/exp-drd/tests/omp_matinv_racy.stderr.exp b/drd/tests/omp_matinv_racy.stderr.exp similarity index 100% rename from exp-drd/tests/omp_matinv_racy.stderr.exp rename to drd/tests/omp_matinv_racy.stderr.exp diff --git a/exp-drd/tests/omp_matinv_racy.stdout.exp b/drd/tests/omp_matinv_racy.stdout.exp similarity index 100% rename from exp-drd/tests/omp_matinv_racy.stdout.exp rename to drd/tests/omp_matinv_racy.stdout.exp diff --git a/exp-drd/tests/omp_matinv_racy.vgtest b/drd/tests/omp_matinv_racy.vgtest similarity index 100% rename from exp-drd/tests/omp_matinv_racy.vgtest rename to drd/tests/omp_matinv_racy.vgtest diff --git a/exp-drd/tests/omp_prime.c b/drd/tests/omp_prime.c similarity index 100% rename from exp-drd/tests/omp_prime.c rename to drd/tests/omp_prime.c diff --git a/exp-drd/tests/omp_prime_racy.stderr.exp b/drd/tests/omp_prime_racy.stderr.exp similarity index 100% rename from exp-drd/tests/omp_prime_racy.stderr.exp rename to drd/tests/omp_prime_racy.stderr.exp diff --git a/exp-drd/tests/omp_prime_racy.vgtest b/drd/tests/omp_prime_racy.vgtest similarity index 100% rename from exp-drd/tests/omp_prime_racy.vgtest rename to drd/tests/omp_prime_racy.vgtest diff --git a/exp-drd/tests/pth_barrier.c b/drd/tests/pth_barrier.c similarity index 100% rename from exp-drd/tests/pth_barrier.c rename to drd/tests/pth_barrier.c diff --git a/exp-drd/tests/pth_barrier.stderr.exp b/drd/tests/pth_barrier.stderr.exp similarity index 100% rename from exp-drd/tests/pth_barrier.stderr.exp rename to drd/tests/pth_barrier.stderr.exp diff --git a/exp-drd/tests/pth_barrier.vgtest b/drd/tests/pth_barrier.vgtest similarity index 100% rename from exp-drd/tests/pth_barrier.vgtest rename to drd/tests/pth_barrier.vgtest diff --git a/exp-drd/tests/pth_barrier2.stderr.exp b/drd/tests/pth_barrier2.stderr.exp similarity index 100% rename from exp-drd/tests/pth_barrier2.stderr.exp rename to drd/tests/pth_barrier2.stderr.exp diff --git a/exp-drd/tests/pth_barrier2.vgtest b/drd/tests/pth_barrier2.vgtest similarity index 100% rename from exp-drd/tests/pth_barrier2.vgtest rename to drd/tests/pth_barrier2.vgtest diff --git a/exp-drd/tests/pth_barrier3.stderr.exp b/drd/tests/pth_barrier3.stderr.exp similarity index 100% rename from exp-drd/tests/pth_barrier3.stderr.exp rename to drd/tests/pth_barrier3.stderr.exp diff --git a/exp-drd/tests/pth_barrier3.vgtest b/drd/tests/pth_barrier3.vgtest similarity index 100% rename from exp-drd/tests/pth_barrier3.vgtest rename to drd/tests/pth_barrier3.vgtest diff --git a/exp-drd/tests/pth_barrier_reinit.c b/drd/tests/pth_barrier_reinit.c similarity index 100% rename from exp-drd/tests/pth_barrier_reinit.c rename to drd/tests/pth_barrier_reinit.c diff --git a/exp-drd/tests/pth_barrier_reinit.stderr.exp b/drd/tests/pth_barrier_reinit.stderr.exp similarity index 100% rename from exp-drd/tests/pth_barrier_reinit.stderr.exp rename to drd/tests/pth_barrier_reinit.stderr.exp diff --git a/exp-drd/tests/pth_barrier_reinit.vgtest b/drd/tests/pth_barrier_reinit.vgtest similarity index 100% rename from exp-drd/tests/pth_barrier_reinit.vgtest rename to drd/tests/pth_barrier_reinit.vgtest diff --git a/exp-drd/tests/pth_broadcast.c b/drd/tests/pth_broadcast.c similarity index 100% rename from exp-drd/tests/pth_broadcast.c rename to drd/tests/pth_broadcast.c diff --git a/exp-drd/tests/pth_broadcast.stderr.exp b/drd/tests/pth_broadcast.stderr.exp similarity index 100% rename from exp-drd/tests/pth_broadcast.stderr.exp rename to drd/tests/pth_broadcast.stderr.exp diff --git a/exp-drd/tests/pth_broadcast.vgtest b/drd/tests/pth_broadcast.vgtest similarity index 100% rename from exp-drd/tests/pth_broadcast.vgtest rename to drd/tests/pth_broadcast.vgtest diff --git a/exp-drd/tests/pth_cond_race.c b/drd/tests/pth_cond_race.c similarity index 100% rename from exp-drd/tests/pth_cond_race.c rename to drd/tests/pth_cond_race.c diff --git a/exp-drd/tests/pth_cond_race.stderr.exp b/drd/tests/pth_cond_race.stderr.exp similarity index 100% rename from exp-drd/tests/pth_cond_race.stderr.exp rename to drd/tests/pth_cond_race.stderr.exp diff --git a/exp-drd/tests/pth_cond_race.vgtest b/drd/tests/pth_cond_race.vgtest similarity index 100% rename from exp-drd/tests/pth_cond_race.vgtest rename to drd/tests/pth_cond_race.vgtest diff --git a/exp-drd/tests/pth_cond_race2.stderr.exp b/drd/tests/pth_cond_race2.stderr.exp similarity index 100% rename from exp-drd/tests/pth_cond_race2.stderr.exp rename to drd/tests/pth_cond_race2.stderr.exp diff --git a/exp-drd/tests/pth_cond_race2.vgtest b/drd/tests/pth_cond_race2.vgtest similarity index 100% rename from exp-drd/tests/pth_cond_race2.vgtest rename to drd/tests/pth_cond_race2.vgtest diff --git a/exp-drd/tests/pth_cond_race3.stderr.exp b/drd/tests/pth_cond_race3.stderr.exp similarity index 100% rename from exp-drd/tests/pth_cond_race3.stderr.exp rename to drd/tests/pth_cond_race3.stderr.exp diff --git a/exp-drd/tests/pth_cond_race3.vgtest b/drd/tests/pth_cond_race3.vgtest similarity index 100% rename from exp-drd/tests/pth_cond_race3.vgtest rename to drd/tests/pth_cond_race3.vgtest diff --git a/exp-drd/tests/pth_create_chain.c b/drd/tests/pth_create_chain.c similarity index 100% rename from exp-drd/tests/pth_create_chain.c rename to drd/tests/pth_create_chain.c diff --git a/exp-drd/tests/pth_create_chain.stderr.exp b/drd/tests/pth_create_chain.stderr.exp similarity index 100% rename from exp-drd/tests/pth_create_chain.stderr.exp rename to drd/tests/pth_create_chain.stderr.exp diff --git a/exp-drd/tests/pth_create_chain.vgtest b/drd/tests/pth_create_chain.vgtest similarity index 100% rename from exp-drd/tests/pth_create_chain.vgtest rename to drd/tests/pth_create_chain.vgtest diff --git a/exp-drd/tests/pth_detached.c b/drd/tests/pth_detached.c similarity index 100% rename from exp-drd/tests/pth_detached.c rename to drd/tests/pth_detached.c diff --git a/exp-drd/tests/pth_detached.stderr.exp b/drd/tests/pth_detached.stderr.exp similarity index 100% rename from exp-drd/tests/pth_detached.stderr.exp rename to drd/tests/pth_detached.stderr.exp diff --git a/exp-drd/tests/pth_detached.stdout.exp b/drd/tests/pth_detached.stdout.exp similarity index 100% rename from exp-drd/tests/pth_detached.stdout.exp rename to drd/tests/pth_detached.stdout.exp diff --git a/exp-drd/tests/pth_detached.vgtest b/drd/tests/pth_detached.vgtest similarity index 100% rename from exp-drd/tests/pth_detached.vgtest rename to drd/tests/pth_detached.vgtest diff --git a/exp-drd/tests/pth_detached2.stderr.exp b/drd/tests/pth_detached2.stderr.exp similarity index 100% rename from exp-drd/tests/pth_detached2.stderr.exp rename to drd/tests/pth_detached2.stderr.exp diff --git a/exp-drd/tests/pth_detached2.stdout.exp b/drd/tests/pth_detached2.stdout.exp similarity index 100% rename from exp-drd/tests/pth_detached2.stdout.exp rename to drd/tests/pth_detached2.stdout.exp diff --git a/exp-drd/tests/pth_detached2.vgtest b/drd/tests/pth_detached2.vgtest similarity index 100% rename from exp-drd/tests/pth_detached2.vgtest rename to drd/tests/pth_detached2.vgtest diff --git a/exp-drd/tests/pth_detached_sem.c b/drd/tests/pth_detached_sem.c similarity index 100% rename from exp-drd/tests/pth_detached_sem.c rename to drd/tests/pth_detached_sem.c diff --git a/exp-drd/tests/pth_detached_sem.stderr.exp b/drd/tests/pth_detached_sem.stderr.exp similarity index 100% rename from exp-drd/tests/pth_detached_sem.stderr.exp rename to drd/tests/pth_detached_sem.stderr.exp diff --git a/exp-drd/tests/pth_detached_sem.stdout.exp b/drd/tests/pth_detached_sem.stdout.exp similarity index 100% rename from exp-drd/tests/pth_detached_sem.stdout.exp rename to drd/tests/pth_detached_sem.stdout.exp diff --git a/exp-drd/tests/pth_detached_sem.vgtest b/drd/tests/pth_detached_sem.vgtest similarity index 100% rename from exp-drd/tests/pth_detached_sem.vgtest rename to drd/tests/pth_detached_sem.vgtest diff --git a/exp-drd/tests/pth_inconsistent_cond_wait.c b/drd/tests/pth_inconsistent_cond_wait.c similarity index 100% rename from exp-drd/tests/pth_inconsistent_cond_wait.c rename to drd/tests/pth_inconsistent_cond_wait.c diff --git a/exp-drd/tests/pth_inconsistent_cond_wait.stderr.exp b/drd/tests/pth_inconsistent_cond_wait.stderr.exp similarity index 100% rename from exp-drd/tests/pth_inconsistent_cond_wait.stderr.exp rename to drd/tests/pth_inconsistent_cond_wait.stderr.exp diff --git a/exp-drd/tests/pth_inconsistent_cond_wait.vgtest b/drd/tests/pth_inconsistent_cond_wait.vgtest similarity index 100% rename from exp-drd/tests/pth_inconsistent_cond_wait.vgtest rename to drd/tests/pth_inconsistent_cond_wait.vgtest diff --git a/exp-drd/tests/recursive_mutex.c b/drd/tests/recursive_mutex.c similarity index 100% rename from exp-drd/tests/recursive_mutex.c rename to drd/tests/recursive_mutex.c diff --git a/exp-drd/tests/recursive_mutex.stderr.exp b/drd/tests/recursive_mutex.stderr.exp similarity index 100% rename from exp-drd/tests/recursive_mutex.stderr.exp rename to drd/tests/recursive_mutex.stderr.exp diff --git a/exp-drd/tests/recursive_mutex.stdout.exp b/drd/tests/recursive_mutex.stdout.exp similarity index 100% rename from exp-drd/tests/recursive_mutex.stdout.exp rename to drd/tests/recursive_mutex.stdout.exp diff --git a/exp-drd/tests/recursive_mutex.vgtest b/drd/tests/recursive_mutex.vgtest similarity index 100% rename from exp-drd/tests/recursive_mutex.vgtest rename to drd/tests/recursive_mutex.vgtest diff --git a/exp-drd/tests/run_openmp_test b/drd/tests/run_openmp_test similarity index 100% rename from exp-drd/tests/run_openmp_test rename to drd/tests/run_openmp_test diff --git a/exp-drd/tests/rwlock_race.c b/drd/tests/rwlock_race.c similarity index 100% rename from exp-drd/tests/rwlock_race.c rename to drd/tests/rwlock_race.c diff --git a/exp-drd/tests/rwlock_race.stderr.exp b/drd/tests/rwlock_race.stderr.exp similarity index 100% rename from exp-drd/tests/rwlock_race.stderr.exp rename to drd/tests/rwlock_race.stderr.exp diff --git a/exp-drd/tests/rwlock_race.stderr.exp2 b/drd/tests/rwlock_race.stderr.exp2 similarity index 100% rename from exp-drd/tests/rwlock_race.stderr.exp2 rename to drd/tests/rwlock_race.stderr.exp2 diff --git a/exp-drd/tests/rwlock_race.vgtest b/drd/tests/rwlock_race.vgtest similarity index 100% rename from exp-drd/tests/rwlock_race.vgtest rename to drd/tests/rwlock_race.vgtest diff --git a/exp-drd/tests/rwlock_test.c b/drd/tests/rwlock_test.c similarity index 100% rename from exp-drd/tests/rwlock_test.c rename to drd/tests/rwlock_test.c diff --git a/exp-drd/tests/rwlock_test.stderr.exp b/drd/tests/rwlock_test.stderr.exp similarity index 100% rename from exp-drd/tests/rwlock_test.stderr.exp rename to drd/tests/rwlock_test.stderr.exp diff --git a/exp-drd/tests/rwlock_test.vgtest b/drd/tests/rwlock_test.vgtest similarity index 100% rename from exp-drd/tests/rwlock_test.vgtest rename to drd/tests/rwlock_test.vgtest diff --git a/exp-drd/tests/sem_as_mutex.c b/drd/tests/sem_as_mutex.c similarity index 100% rename from exp-drd/tests/sem_as_mutex.c rename to drd/tests/sem_as_mutex.c diff --git a/exp-drd/tests/sem_as_mutex.stderr.exp b/drd/tests/sem_as_mutex.stderr.exp similarity index 100% rename from exp-drd/tests/sem_as_mutex.stderr.exp rename to drd/tests/sem_as_mutex.stderr.exp diff --git a/exp-drd/tests/sem_as_mutex.vgtest b/drd/tests/sem_as_mutex.vgtest similarity index 100% rename from exp-drd/tests/sem_as_mutex.vgtest rename to drd/tests/sem_as_mutex.vgtest diff --git a/exp-drd/tests/sem_as_mutex2.stderr.exp b/drd/tests/sem_as_mutex2.stderr.exp similarity index 100% rename from exp-drd/tests/sem_as_mutex2.stderr.exp rename to drd/tests/sem_as_mutex2.stderr.exp diff --git a/exp-drd/tests/sem_as_mutex2.vgtest b/drd/tests/sem_as_mutex2.vgtest similarity index 100% rename from exp-drd/tests/sem_as_mutex2.vgtest rename to drd/tests/sem_as_mutex2.vgtest diff --git a/exp-drd/tests/sigalrm.c b/drd/tests/sigalrm.c similarity index 100% rename from exp-drd/tests/sigalrm.c rename to drd/tests/sigalrm.c diff --git a/exp-drd/tests/sigalrm.stderr.exp b/drd/tests/sigalrm.stderr.exp similarity index 100% rename from exp-drd/tests/sigalrm.stderr.exp rename to drd/tests/sigalrm.stderr.exp diff --git a/exp-drd/tests/sigalrm.vgtest b/drd/tests/sigalrm.vgtest similarity index 100% rename from exp-drd/tests/sigalrm.vgtest rename to drd/tests/sigalrm.vgtest diff --git a/exp-drd/tests/supported_libpthread b/drd/tests/supported_libpthread similarity index 100% rename from exp-drd/tests/supported_libpthread rename to drd/tests/supported_libpthread diff --git a/exp-drd/tests/tc01_simple_race.stderr.exp b/drd/tests/tc01_simple_race.stderr.exp similarity index 100% rename from exp-drd/tests/tc01_simple_race.stderr.exp rename to drd/tests/tc01_simple_race.stderr.exp diff --git a/exp-drd/tests/tc01_simple_race.vgtest b/drd/tests/tc01_simple_race.vgtest similarity index 100% rename from exp-drd/tests/tc01_simple_race.vgtest rename to drd/tests/tc01_simple_race.vgtest diff --git a/exp-drd/tests/tc02_simple_tls.stderr.exp b/drd/tests/tc02_simple_tls.stderr.exp similarity index 100% rename from exp-drd/tests/tc02_simple_tls.stderr.exp rename to drd/tests/tc02_simple_tls.stderr.exp diff --git a/exp-drd/tests/tc02_simple_tls.vgtest b/drd/tests/tc02_simple_tls.vgtest similarity index 100% rename from exp-drd/tests/tc02_simple_tls.vgtest rename to drd/tests/tc02_simple_tls.vgtest diff --git a/exp-drd/tests/tc03_re_excl.stderr.exp b/drd/tests/tc03_re_excl.stderr.exp similarity index 100% rename from exp-drd/tests/tc03_re_excl.stderr.exp rename to drd/tests/tc03_re_excl.stderr.exp diff --git a/exp-drd/tests/tc03_re_excl.vgtest b/drd/tests/tc03_re_excl.vgtest similarity index 100% rename from exp-drd/tests/tc03_re_excl.vgtest rename to drd/tests/tc03_re_excl.vgtest diff --git a/exp-drd/tests/tc04_free_lock.stderr.exp b/drd/tests/tc04_free_lock.stderr.exp similarity index 100% rename from exp-drd/tests/tc04_free_lock.stderr.exp rename to drd/tests/tc04_free_lock.stderr.exp diff --git a/exp-drd/tests/tc04_free_lock.vgtest b/drd/tests/tc04_free_lock.vgtest similarity index 100% rename from exp-drd/tests/tc04_free_lock.vgtest rename to drd/tests/tc04_free_lock.vgtest diff --git a/exp-drd/tests/tc05_simple_race.stderr.exp b/drd/tests/tc05_simple_race.stderr.exp similarity index 100% rename from exp-drd/tests/tc05_simple_race.stderr.exp rename to drd/tests/tc05_simple_race.stderr.exp diff --git a/exp-drd/tests/tc05_simple_race.vgtest b/drd/tests/tc05_simple_race.vgtest similarity index 100% rename from exp-drd/tests/tc05_simple_race.vgtest rename to drd/tests/tc05_simple_race.vgtest diff --git a/exp-drd/tests/tc06_two_races.stderr.exp b/drd/tests/tc06_two_races.stderr.exp similarity index 100% rename from exp-drd/tests/tc06_two_races.stderr.exp rename to drd/tests/tc06_two_races.stderr.exp diff --git a/exp-drd/tests/tc06_two_races.vgtest b/drd/tests/tc06_two_races.vgtest similarity index 100% rename from exp-drd/tests/tc06_two_races.vgtest rename to drd/tests/tc06_two_races.vgtest diff --git a/exp-drd/tests/tc07_hbl1.stderr.exp b/drd/tests/tc07_hbl1.stderr.exp similarity index 100% rename from exp-drd/tests/tc07_hbl1.stderr.exp rename to drd/tests/tc07_hbl1.stderr.exp diff --git a/exp-drd/tests/tc07_hbl1.stdout.exp b/drd/tests/tc07_hbl1.stdout.exp similarity index 100% rename from exp-drd/tests/tc07_hbl1.stdout.exp rename to drd/tests/tc07_hbl1.stdout.exp diff --git a/exp-drd/tests/tc07_hbl1.vgtest b/drd/tests/tc07_hbl1.vgtest similarity index 100% rename from exp-drd/tests/tc07_hbl1.vgtest rename to drd/tests/tc07_hbl1.vgtest diff --git a/exp-drd/tests/tc08_hbl2.stderr.exp b/drd/tests/tc08_hbl2.stderr.exp similarity index 100% rename from exp-drd/tests/tc08_hbl2.stderr.exp rename to drd/tests/tc08_hbl2.stderr.exp diff --git a/exp-drd/tests/tc08_hbl2.stdout.exp b/drd/tests/tc08_hbl2.stdout.exp similarity index 100% rename from exp-drd/tests/tc08_hbl2.stdout.exp rename to drd/tests/tc08_hbl2.stdout.exp diff --git a/exp-drd/tests/tc08_hbl2.vgtest b/drd/tests/tc08_hbl2.vgtest similarity index 100% rename from exp-drd/tests/tc08_hbl2.vgtest rename to drd/tests/tc08_hbl2.vgtest diff --git a/exp-drd/tests/tc09_bad_unlock.stderr.exp b/drd/tests/tc09_bad_unlock.stderr.exp similarity index 100% rename from exp-drd/tests/tc09_bad_unlock.stderr.exp rename to drd/tests/tc09_bad_unlock.stderr.exp diff --git a/exp-drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8 b/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8 similarity index 100% rename from exp-drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8 rename to drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8 diff --git a/exp-drd/tests/tc09_bad_unlock.vgtest b/drd/tests/tc09_bad_unlock.vgtest similarity index 100% rename from exp-drd/tests/tc09_bad_unlock.vgtest rename to drd/tests/tc09_bad_unlock.vgtest diff --git a/exp-drd/tests/tc10_rec_lock.stderr.exp b/drd/tests/tc10_rec_lock.stderr.exp similarity index 100% rename from exp-drd/tests/tc10_rec_lock.stderr.exp rename to drd/tests/tc10_rec_lock.stderr.exp diff --git a/exp-drd/tests/tc10_rec_lock.vgtest b/drd/tests/tc10_rec_lock.vgtest similarity index 100% rename from exp-drd/tests/tc10_rec_lock.vgtest rename to drd/tests/tc10_rec_lock.vgtest diff --git a/exp-drd/tests/tc11_XCHG.stderr.exp b/drd/tests/tc11_XCHG.stderr.exp similarity index 100% rename from exp-drd/tests/tc11_XCHG.stderr.exp rename to drd/tests/tc11_XCHG.stderr.exp diff --git a/exp-drd/tests/tc11_XCHG.stdout.exp b/drd/tests/tc11_XCHG.stdout.exp similarity index 100% rename from exp-drd/tests/tc11_XCHG.stdout.exp rename to drd/tests/tc11_XCHG.stdout.exp diff --git a/exp-drd/tests/tc11_XCHG.vgtest b/drd/tests/tc11_XCHG.vgtest similarity index 100% rename from exp-drd/tests/tc11_XCHG.vgtest rename to drd/tests/tc11_XCHG.vgtest diff --git a/exp-drd/tests/tc12_rwl_trivial.stderr.exp b/drd/tests/tc12_rwl_trivial.stderr.exp similarity index 100% rename from exp-drd/tests/tc12_rwl_trivial.stderr.exp rename to drd/tests/tc12_rwl_trivial.stderr.exp diff --git a/exp-drd/tests/tc12_rwl_trivial.vgtest b/drd/tests/tc12_rwl_trivial.vgtest similarity index 100% rename from exp-drd/tests/tc12_rwl_trivial.vgtest rename to drd/tests/tc12_rwl_trivial.vgtest diff --git a/exp-drd/tests/tc13_laog1.stderr.exp b/drd/tests/tc13_laog1.stderr.exp similarity index 100% rename from exp-drd/tests/tc13_laog1.stderr.exp rename to drd/tests/tc13_laog1.stderr.exp diff --git a/exp-drd/tests/tc13_laog1.vgtest b/drd/tests/tc13_laog1.vgtest similarity index 100% rename from exp-drd/tests/tc13_laog1.vgtest rename to drd/tests/tc13_laog1.vgtest diff --git a/exp-drd/tests/tc15_laog_lockdel.stderr.exp b/drd/tests/tc15_laog_lockdel.stderr.exp similarity index 100% rename from exp-drd/tests/tc15_laog_lockdel.stderr.exp rename to drd/tests/tc15_laog_lockdel.stderr.exp diff --git a/exp-drd/tests/tc15_laog_lockdel.vgtest b/drd/tests/tc15_laog_lockdel.vgtest similarity index 100% rename from exp-drd/tests/tc15_laog_lockdel.vgtest rename to drd/tests/tc15_laog_lockdel.vgtest diff --git a/exp-drd/tests/tc16_byterace.stderr.exp b/drd/tests/tc16_byterace.stderr.exp similarity index 100% rename from exp-drd/tests/tc16_byterace.stderr.exp rename to drd/tests/tc16_byterace.stderr.exp diff --git a/exp-drd/tests/tc16_byterace.vgtest b/drd/tests/tc16_byterace.vgtest similarity index 100% rename from exp-drd/tests/tc16_byterace.vgtest rename to drd/tests/tc16_byterace.vgtest diff --git a/exp-drd/tests/tc17_sembar.stderr.exp b/drd/tests/tc17_sembar.stderr.exp similarity index 100% rename from exp-drd/tests/tc17_sembar.stderr.exp rename to drd/tests/tc17_sembar.stderr.exp diff --git a/exp-drd/tests/tc17_sembar.vgtest b/drd/tests/tc17_sembar.vgtest similarity index 100% rename from exp-drd/tests/tc17_sembar.vgtest rename to drd/tests/tc17_sembar.vgtest diff --git a/exp-drd/tests/tc18_semabuse.stderr.exp b/drd/tests/tc18_semabuse.stderr.exp similarity index 100% rename from exp-drd/tests/tc18_semabuse.stderr.exp rename to drd/tests/tc18_semabuse.stderr.exp diff --git a/exp-drd/tests/tc18_semabuse.vgtest b/drd/tests/tc18_semabuse.vgtest similarity index 100% rename from exp-drd/tests/tc18_semabuse.vgtest rename to drd/tests/tc18_semabuse.vgtest diff --git a/exp-drd/tests/tc19_shadowmem.stderr.exp b/drd/tests/tc19_shadowmem.stderr.exp similarity index 100% rename from exp-drd/tests/tc19_shadowmem.stderr.exp rename to drd/tests/tc19_shadowmem.stderr.exp diff --git a/exp-drd/tests/tc19_shadowmem.vgtest b/drd/tests/tc19_shadowmem.vgtest similarity index 100% rename from exp-drd/tests/tc19_shadowmem.vgtest rename to drd/tests/tc19_shadowmem.vgtest diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp b/drd/tests/tc20_verifywrap.stderr.exp similarity index 100% rename from exp-drd/tests/tc20_verifywrap.stderr.exp rename to drd/tests/tc20_verifywrap.stderr.exp diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 similarity index 100% rename from exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 rename to drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 b/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 similarity index 100% rename from exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 rename to drd/tests/tc20_verifywrap.stderr.exp-glibc2.8 diff --git a/exp-drd/tests/tc20_verifywrap.vgtest b/drd/tests/tc20_verifywrap.vgtest similarity index 100% rename from exp-drd/tests/tc20_verifywrap.vgtest rename to drd/tests/tc20_verifywrap.vgtest diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp b/drd/tests/tc20_verifywrap2.stderr.exp similarity index 100% rename from exp-drd/tests/tc20_verifywrap2.stderr.exp rename to drd/tests/tc20_verifywrap2.stderr.exp diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 similarity index 100% rename from exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 rename to drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b similarity index 100% rename from exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b rename to drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b diff --git a/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 similarity index 100% rename from exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 rename to drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 diff --git a/exp-drd/tests/tc20_verifywrap2.vgtest b/drd/tests/tc20_verifywrap2.vgtest similarity index 100% rename from exp-drd/tests/tc20_verifywrap2.vgtest rename to drd/tests/tc20_verifywrap2.vgtest diff --git a/exp-drd/tests/tc21_pthonce.stderr.exp b/drd/tests/tc21_pthonce.stderr.exp similarity index 100% rename from exp-drd/tests/tc21_pthonce.stderr.exp rename to drd/tests/tc21_pthonce.stderr.exp diff --git a/exp-drd/tests/tc21_pthonce.stdout.exp b/drd/tests/tc21_pthonce.stdout.exp similarity index 100% rename from exp-drd/tests/tc21_pthonce.stdout.exp rename to drd/tests/tc21_pthonce.stdout.exp diff --git a/exp-drd/tests/tc21_pthonce.vgtest b/drd/tests/tc21_pthonce.vgtest similarity index 100% rename from exp-drd/tests/tc21_pthonce.vgtest rename to drd/tests/tc21_pthonce.vgtest diff --git a/exp-drd/tests/tc22_exit_w_lock.stderr.exp-32bit b/drd/tests/tc22_exit_w_lock.stderr.exp-32bit similarity index 100% rename from exp-drd/tests/tc22_exit_w_lock.stderr.exp-32bit rename to drd/tests/tc22_exit_w_lock.stderr.exp-32bit diff --git a/exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit b/drd/tests/tc22_exit_w_lock.stderr.exp-64bit similarity index 100% rename from exp-drd/tests/tc22_exit_w_lock.stderr.exp-64bit rename to drd/tests/tc22_exit_w_lock.stderr.exp-64bit diff --git a/exp-drd/tests/tc22_exit_w_lock.vgtest b/drd/tests/tc22_exit_w_lock.vgtest similarity index 100% rename from exp-drd/tests/tc22_exit_w_lock.vgtest rename to drd/tests/tc22_exit_w_lock.vgtest diff --git a/exp-drd/tests/tc23_bogus_condwait.stderr.exp b/drd/tests/tc23_bogus_condwait.stderr.exp similarity index 100% rename from exp-drd/tests/tc23_bogus_condwait.stderr.exp rename to drd/tests/tc23_bogus_condwait.stderr.exp diff --git a/exp-drd/tests/tc23_bogus_condwait.vgtest b/drd/tests/tc23_bogus_condwait.vgtest similarity index 100% rename from exp-drd/tests/tc23_bogus_condwait.vgtest rename to drd/tests/tc23_bogus_condwait.vgtest diff --git a/exp-drd/tests/tc24_nonzero_sem.stderr.exp b/drd/tests/tc24_nonzero_sem.stderr.exp similarity index 100% rename from exp-drd/tests/tc24_nonzero_sem.stderr.exp rename to drd/tests/tc24_nonzero_sem.stderr.exp diff --git a/exp-drd/tests/tc24_nonzero_sem.vgtest b/drd/tests/tc24_nonzero_sem.vgtest similarity index 100% rename from exp-drd/tests/tc24_nonzero_sem.vgtest rename to drd/tests/tc24_nonzero_sem.vgtest diff --git a/exp-drd/tests/trylock.c b/drd/tests/trylock.c similarity index 100% rename from exp-drd/tests/trylock.c rename to drd/tests/trylock.c diff --git a/exp-drd/tests/trylock.stderr.exp b/drd/tests/trylock.stderr.exp similarity index 100% rename from exp-drd/tests/trylock.stderr.exp rename to drd/tests/trylock.stderr.exp diff --git a/exp-drd/tests/trylock.vgtest b/drd/tests/trylock.vgtest similarity index 100% rename from exp-drd/tests/trylock.vgtest rename to drd/tests/trylock.vgtest diff --git a/exp-drd/Makefile.am b/exp-drd/Makefile.am deleted file mode 100644 index 4555f8c029..0000000000 --- a/exp-drd/Makefile.am +++ /dev/null @@ -1,165 +0,0 @@ -include $(top_srcdir)/Makefile.tool.am - -noinst_PROGRAMS = -if VGP_X86_LINUX - noinst_PROGRAMS += exp-drd-x86-linux vgpreload_exp-drd-x86-linux.so -endif -if VGP_AMD64_LINUX - noinst_PROGRAMS += exp-drd-amd64-linux vgpreload_exp-drd-amd64-linux.so -endif -if VGP_PPC32_LINUX - noinst_PROGRAMS += exp-drd-ppc32-linux vgpreload_exp-drd-ppc32-linux.so -endif -if VGP_PPC64_LINUX - noinst_PROGRAMS += exp-drd-ppc64-linux vgpreload_exp-drd-ppc64-linux.so -endif -if VGP_PPC32_AIX5 - noinst_PROGRAMS += exp-drd-ppc32-aix5 vgpreload_exp-drd-ppc32-aix5.so -endif -if VGP_PPC64_AIX5 - noinst_PROGRAMS += exp-drd-ppc64-aix5 vgpreload_exp-drd-ppc64-aix5.so -endif - -if HAVE_OPENMP -VGPRELOAD_DRD_SOURCES_COMMON = \ - drd_strmem_intercepts.c drd_pthread_intercepts.c drd_gomp_intercepts.c -else -VGPRELOAD_DRD_SOURCES_COMMON = drd_strmem_intercepts.c drd_pthread_intercepts.c -endif - -DRD_CFLAGS=@FLAG_W_EXTRA@ @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@ \ - -Wno-inline -Wno-unused-parameter \ - -O2 -DCHECK_FORMAT_STRINGS - -AM_CFLAGS_X86_LINUX += $(DRD_CFLAGS) -AM_CFLAGS_AMD64_LINUX += $(DRD_CFLAGS) -AM_CFLAGS_PPC32_LINUX += $(DRD_CFLAGS) -AM_CFLAGS_PPC64_LINUX += $(DRD_CFLAGS) -AM_CFLAGS_PPC32_AIX5 += $(DRD_CFLAGS) -AM_CFLAGS_PPC64_AIX5 += $(DRD_CFLAGS) - -vgpreload_exp_drd_x86_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) -vgpreload_exp_drd_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -vgpreload_exp_drd_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) -vgpreload_exp_drd_x86_linux_so_CCASFLAGS = $(AM_CCASFLAGS_X86_LINUX) -vgpreload_exp_drd_x86_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_X86_LINUX) -vgpreload_exp_drd_x86_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_X86_LINUX)\ - $(LIBREPLACEMALLOC_LDFLAGS_X86_LINUX) - -vgpreload_exp_drd_amd64_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) -vgpreload_exp_drd_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_exp_drd_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -vgpreload_exp_drd_amd64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) -vgpreload_exp_drd_amd64_linux_so_DEPENDENCIES = -vgpreload_exp_drd_amd64_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_AMD64_LINUX)\ - $(LIBREPLACEMALLOC_LDFLAGS_AMD64_LINUX) - -vgpreload_exp_drd_ppc32_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) -vgpreload_exp_drd_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -vgpreload_exp_drd_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) -vgpreload_exp_drd_ppc32_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_LINUX) -vgpreload_exp_drd_ppc32_linux_so_DEPENDENCIES = -vgpreload_exp_drd_ppc32_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC32_LINUX)\ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_LINUX) - -vgpreload_exp_drd_ppc64_linux_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) -vgpreload_exp_drd_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -vgpreload_exp_drd_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) -vgpreload_exp_drd_ppc64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_LINUX) -vgpreload_exp_drd_ppc64_linux_so_DEPENDENCIES = -vgpreload_exp_drd_ppc64_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC64_LINUX)\ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_LINUX) - -vgpreload_exp_drd_ppc32_aix5_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) -vgpreload_exp_drd_ppc32_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -vgpreload_exp_drd_ppc32_aix5_so_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) -vgpreload_exp_drd_ppc32_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC32_AIX5) -vgpreload_exp_drd_ppc32_aix5_so_DEPENDENCIES = -vgpreload_exp_drd_ppc32_aix5_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC32_AIX5)\ - $(LIBREPLACEMALLOC_LDFLAGS_PPC32_AIX5) - -vgpreload_exp_drd_ppc64_aix5_so_SOURCES = $(VGPRELOAD_DRD_SOURCES_COMMON) -vgpreload_exp_drd_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -vgpreload_exp_drd_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) -vgpreload_exp_drd_ppc64_aix5_so_CCASFLAGS = $(AM_CCASFLAGS_PPC64_AIX5) -vgpreload_exp_drd_ppc64_aix5_so_DEPENDENCIES = -vgpreload_exp_drd_ppc64_aix5_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC64_AIX5)\ - $(LIBREPLACEMALLOC_LDFLAGS_PPC64_AIX5) - - -DRD_SOURCES_COMMON = \ - drd_barrier.c \ - drd_clientobj.c \ - drd_clientreq.c \ - drd_cond.c \ - drd_error.c \ - drd_main.c \ - drd_malloc_wrappers.c \ - drd_mutex.c \ - drd_rwlock.c \ - drd_semaphore.c \ - drd_suppression.c - -drdincludedir = $(includedir)/valgrind - -drdinclude_HEADERS = drd.h - -noinst_HEADERS = \ - drd_barrier.h \ - drd_bitmap.h \ - drd_clientobj.h \ - drd_clientreq.h \ - drd_cond.h \ - drd_error.h \ - drd_malloc_wrappers.h \ - drd_mutex.h \ - drd_rwlock.h \ - drd_segment.h \ - drd_semaphore.h \ - drd_suppression.h \ - drd_thread.h \ - drd_track.h \ - drd_vc.h \ - pub_drd_bitmap.h - -exp_drd_x86_linux_SOURCES = $(DRD_SOURCES_COMMON) -exp_drd_x86_linux_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) -exp_drd_x86_linux_CFLAGS = $(AM_CFLAGS_X86_LINUX) -exp_drd_x86_linux_DEPENDENCIES = $(COREGRIND_LIBS_X86_LINUX) -exp_drd_x86_linux_LDADD = $(TOOL_LDADD_X86_LINUX) -exp_drd_x86_linux_LDFLAGS = $(TOOL_LDFLAGS_X86_LINUX) - -exp_drd_amd64_linux_SOURCES = $(DRD_SOURCES_COMMON) -exp_drd_amd64_linux_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -exp_drd_amd64_linux_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -exp_drd_amd64_linux_DEPENDENCIES = $(COREGRIND_LIBS_AMD64_LINUX) -exp_drd_amd64_linux_LDADD = $(TOOL_LDADD_AMD64_LINUX) -exp_drd_amd64_linux_LDFLAGS = $(TOOL_LDFLAGS_AMD64_LINUX) - -exp_drd_ppc32_linux_SOURCES = $(DRD_SOURCES_COMMON) -exp_drd_ppc32_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) -exp_drd_ppc32_linux_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -exp_drd_ppc32_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_LINUX) -exp_drd_ppc32_linux_LDADD = $(TOOL_LDADD_PPC32_LINUX) -exp_drd_ppc32_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC32_LINUX) - -exp_drd_ppc64_linux_SOURCES = $(DRD_SOURCES_COMMON) -exp_drd_ppc64_linux_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) -exp_drd_ppc64_linux_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) -exp_drd_ppc64_linux_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_LINUX) -exp_drd_ppc64_linux_LDADD = $(TOOL_LDADD_PPC64_LINUX) -exp_drd_ppc64_linux_LDFLAGS = $(TOOL_LDFLAGS_PPC64_LINUX) - -exp_drd_ppc32_aix5_SOURCES = $(DRD_SOURCES_COMMON) -exp_drd_ppc32_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) -exp_drd_ppc32_aix5_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) -exp_drd_ppc32_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC32_AIX5) -exp_drd_ppc32_aix5_LDADD = $(TOOL_LDADD_PPC32_AIX5) -exp_drd_ppc32_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC32_AIX5) - -exp_drd_ppc64_aix5_SOURCES = $(DRD_SOURCES_COMMON) -exp_drd_ppc64_aix5_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) -exp_drd_ppc64_aix5_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -exp_drd_ppc64_aix5_DEPENDENCIES = $(COREGRIND_LIBS_PPC64_AIX5) -exp_drd_ppc64_aix5_LDADD = $(TOOL_LDADD_PPC64_AIX5) -exp_drd_ppc64_aix5_LDFLAGS = $(TOOL_LDFLAGS_PPC64_AIX5)