|
From: <sv...@va...> - 2009-06-02 06:55:03
|
Author: njn Date: 2009-06-02 07:54:57 +0100 (Tue, 02 Jun 2009) New Revision: 10204 Log: Back out r10197--r10200 and r10202--r10203. I'm going to put them, and further, related changes, on a branch instead. Modified: trunk/Makefile.flags.am trunk/coregrind/Makefile.am trunk/drd/tests/Makefile.am Modified: trunk/Makefile.flags.am =================================================================== --- trunk/Makefile.flags.am 2009-06-02 05:27:07 UTC (rev 10203) +++ trunk/Makefile.flags.am 2009-06-02 06:54:57 UTC (rev 10204) @@ -30,56 +30,78 @@ # means some of the flags are duplicated on systems with newer versions of # automake, but this does not really matter and seems hard to avoid. -AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@ = \ - -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub \ - -DVGA_@VGCONF_ARCH_PRI@=1 \ - -DVGO_@VGCONF_OS@=1 \ - -DVGP_@VGCONF_ARCH_PRI@_@VGCONF_OS@=1 -if VGCONF_HAVE_PLATFORM_SEC -AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@ = \ - -I$(top_srcdir)/include \ - -I@VEX_DIR@/pub \ - -DVGA_@VGCONF_ARCH_SEC@=1 \ - -DVGO_@VGCONF_OS@=1 \ - -DVGP_@VGCONF_ARCH_SEC@_@VGCONF_OS@=1 -endif +AM_CPPFLAGS_COMMON = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I@VEX_DIR@/pub AM_FLAG_M3264_X86_LINUX = @FLAG_M32@ +AM_CPPFLAGS_X86_LINUX = $(AM_CPPFLAGS_COMMON) \ + -DVGA_x86=1 \ + -DVGO_linux=1 \ + -DVGP_x86_linux=1 AM_CFLAGS_X86_LINUX = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(AM_CPPFLAGS_X86_LINUX) @FLAG_M32@ -g AM_FLAG_M3264_AMD64_LINUX = @FLAG_M64@ +AM_CPPFLAGS_AMD64_LINUX = $(AM_CPPFLAGS_COMMON) \ + -DVGA_amd64=1 \ + -DVGO_linux=1 \ + -DVGP_amd64_linux=1 AM_CFLAGS_AMD64_LINUX = @FLAG_M64@ -fomit-frame-pointer \ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(AM_CPPFLAGS_AMD64_LINUX) @FLAG_M64@ -g AM_FLAG_M3264_PPC32_LINUX = @FLAG_M32@ +AM_CPPFLAGS_PPC32_LINUX = $(AM_CPPFLAGS_COMMON) \ + -DVGA_ppc32=1 \ + -DVGO_linux=1 \ + -DVGP_ppc32_linux=1 AM_CFLAGS_PPC32_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC32_LINUX = $(AM_CPPFLAGS_PPC32_LINUX) @FLAG_M32@ -g AM_FLAG_M3264_PPC64_LINUX = @FLAG_M64@ +AM_CPPFLAGS_PPC64_LINUX = $(AM_CPPFLAGS_COMMON) \ + -DVGA_ppc64=1 \ + -DVGO_linux=1 \ + -DVGP_ppc64_linux=1 AM_CFLAGS_PPC64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC64_LINUX = $(AM_CPPFLAGS_PPC64_LINUX) @FLAG_M64@ -g AM_FLAG_M3264_PPC32_AIX5 = @FLAG_MAIX32@ +AM_CPPFLAGS_PPC32_AIX5 = $(AM_CPPFLAGS_COMMON) \ + -DVGA_ppc32=1 \ + -DVGO_aix5=1 \ + -DVGP_ppc32_aix5=1 AM_CFLAGS_PPC32_AIX5 = @FLAG_MAIX32@ -mcpu=powerpc $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC32_AIX5 = $(AM_CPPFLAGS_PPC32_AIX5) \ @FLAG_MAIX32@ -mcpu=powerpc -g AM_FLAG_M3264_PPC64_AIX5 = @FLAG_MAIX64@ +AM_CPPFLAGS_PPC64_AIX5 = $(AM_CPPFLAGS_COMMON) \ + -DVGA_ppc64=1 \ + -DVGO_aix5=1 \ + -DVGP_ppc64_aix5=1 AM_CFLAGS_PPC64_AIX5 = @FLAG_MAIX64@ -mcpu=powerpc64 $(AM_CFLAGS_BASE) AM_CCASFLAGS_PPC64_AIX5 = $(AM_CPPFLAGS_PPC64_AIX5) \ @FLAG_MAIX64@ -mcpu=powerpc64 -g AM_FLAG_M3264_X86_DARWIN = -arch i386 +AM_CPPFLAGS_X86_DARWIN = $(AM_CPPFLAGS_COMMON) \ + -DVGA_x86=1 \ + -DVGO_darwin=1 \ + -DVGP_x86_darwin=1 AM_CFLAGS_X86_DARWIN = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \ -mmacosx-version-min=10.5 -fno-stack-protector \ -mdynamic-no-pic AM_CCASFLAGS_X86_DARWIN = $(AM_CPPFLAGS_X86_DARWIN) -arch i386 -g AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64 +AM_CPPFLAGS_AMD64_DARWIN = $(AM_CPPFLAGS_COMMON) \ + -DVGA_amd64=1 \ + -DVGO_darwin=1 \ + -DVGP_amd64_darwin=1 AM_CFLAGS_AMD64_DARWIN = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \ -mmacosx-version-min=10.5 -fno-stack-protector AM_CCASFLAGS_AMD64_DARWIN = $(AM_CPPFLAGS_AMD64_DARWIN) -arch x86_64 -g Modified: trunk/coregrind/Makefile.am =================================================================== --- trunk/coregrind/Makefile.am 2009-06-02 05:27:07 UTC (rev 10203) +++ trunk/coregrind/Makefile.am 2009-06-02 06:54:57 UTC (rev 10204) @@ -7,62 +7,95 @@ include $(top_srcdir)/Makefile.flags.am include $(top_srcdir)/Makefile.core-tool.am -#---------------------------------------------------------------------------- -# Basics, flags -#---------------------------------------------------------------------------- +AM_CPPFLAGS_CORE_COMMON = \ + -I$(top_srcdir)/coregrind \ + -DVG_LIBDIR="\"$(valdir)"\" -AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@ += \ - -I$(top_srcdir)/coregrind \ - -DVG_LIBDIR="\"$(valdir)"\" \ - -DVG_PLATFORM="\"@VGCONF_ARCH_PRI@-@VGCONF_OS@\"" -if VGCONF_HAVE_PLATFORM_SEC -AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@ += \ - -I$(top_srcdir)/coregrind \ - -DVG_LIBDIR="\"$(valdir)"\" \ - -DVG_PLATFORM="\"@VGCONF_ARCH_SEC@-@VGCONF_OS@\"" -endif +AM_CPPFLAGS_X86_LINUX += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"x86-linux\"" +AM_CPPFLAGS_AMD64_LINUX += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"amd64-linux\"" +AM_CPPFLAGS_PPC32_LINUX += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc32-linux\"" + +AM_CPPFLAGS_PPC64_LINUX += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc64-linux\"" + +AM_CPPFLAGS_PPC32_AIX5 += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc32-aix5\"" + +AM_CPPFLAGS_PPC64_AIX5 += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc64-aix5\"" + +AM_CPPFLAGS_X86_DARWIN += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"x86-darwin\"" + +AM_CPPFLAGS_AMD64_DARWIN += \ + $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"amd64-darwin\"" + + default.supp: $(SUPP_FILES) +noinst_PROGRAMS = +noinst_DSYMS = pkglib_LIBRARIES = +LIBVEX = if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -pkglib_LIBRARIES += libcoregrind-x86-linux.a +noinst_PROGRAMS += vgpreload_core-x86-linux.so +pkglib_LIBRARIES += libcoregrind-x86-linux.a libreplacemalloc_toolpreload-x86-linux.a +LIBVEX += libvex-x86-linux.a endif if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -pkglib_LIBRARIES += libcoregrind-amd64-linux.a +noinst_PROGRAMS += vgpreload_core-amd64-linux.so +pkglib_LIBRARIES += libcoregrind-amd64-linux.a libreplacemalloc_toolpreload-amd64-linux.a +LIBVEX += libvex-amd64-linux.a endif if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -pkglib_LIBRARIES += libcoregrind-ppc32-linux.a +noinst_PROGRAMS += vgpreload_core-ppc32-linux.so +pkglib_LIBRARIES += libcoregrind-ppc32-linux.a libreplacemalloc_toolpreload-ppc32-linux.a +LIBVEX += libvex-ppc32-linux.a endif if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -pkglib_LIBRARIES += libcoregrind-ppc64-linux.a +noinst_PROGRAMS += vgpreload_core-ppc64-linux.so +pkglib_LIBRARIES += libcoregrind-ppc64-linux.a libreplacemalloc_toolpreload-ppc64-linux.a +LIBVEX += libvex-ppc64-linux.a endif if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -pkglib_LIBRARIES += libcoregrind-ppc32-aix5.a +noinst_PROGRAMS += vgpreload_core-ppc32-aix5.so +pkglib_LIBRARIES += libcoregrind-ppc32-aix5.a libreplacemalloc_toolpreload-ppc32-aix5.a +LIBVEX += libvex-ppc32-aix5.a endif if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -pkglib_LIBRARIES += libcoregrind-ppc64-aix5.a +noinst_PROGRAMS += vgpreload_core-ppc64-aix5.so +pkglib_LIBRARIES += libcoregrind-ppc64-aix5.a libreplacemalloc_toolpreload-ppc64-aix5.a +LIBVEX += libvex-ppc64-aix5.a endif if VGCONF_PLATFORMS_INCLUDE_X86_DARWIN -pkglib_LIBRARIES += libcoregrind-x86-darwin.a +noinst_PROGRAMS += vgpreload_core-x86-darwin.so +noinst_DSYMS += vgpreload_core-x86-darwin.so +pkglib_LIBRARIES += libcoregrind-x86-darwin.a libreplacemalloc_toolpreload-x86-darwin.a +LIBVEX += libvex-x86-darwin.a endif if VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN -pkglib_LIBRARIES += libcoregrind-amd64-darwin.a +noinst_PROGRAMS += vgpreload_core-amd64-darwin.so +noinst_DSYMS += vgpreload_core-amd64-darwin.so +pkglib_LIBRARIES += libcoregrind-amd64-darwin.a libreplacemalloc_toolpreload-amd64-darwin.a +LIBVEX += libvex-amd64-darwin.a endif -#---------------------------------------------------------------------------- -# The launcher -#---------------------------------------------------------------------------- + +#------------------------- launcher ----------------------- # Build the launcher (valgrind) for the primary target only. # bin_PROGRAMS = \ @@ -85,21 +118,6 @@ m_debuglog.c endif -valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI) -valgrind_CFLAGS = $(AM_CFLAGS_PRI) -valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI) -valgrind_LDFLAGS = $(AM_CFLAGS_PRI) - -no_op_client_for_valgrind_SOURCES = no_op_client_for_valgrind.c -no_op_client_for_valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI) -no_op_client_for_valgrind_CFLAGS = $(AM_CFLAGS_PRI) -no_op_client_for_valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI) -no_op_client_for_valgrind_LDFLAGS = $(AM_CFLAGS_PRI) - -#---------------------------------------------------------------------------- -# Darwin Mach stuff -#---------------------------------------------------------------------------- - # Mach RPC interface definitions # Here are some more .defs files that are not used, but could be in the # future: @@ -135,10 +153,20 @@ $(mach_srcs) $(mach_hdrs): $(mach_files) (cd m_mach && mig $(mach_files)) -#---------------------------------------------------------------------------- -# Headers -#---------------------------------------------------------------------------- +valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI) +valgrind_CFLAGS = $(AM_CFLAGS_PRI) +valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI) +valgrind_LDFLAGS = $(AM_CFLAGS_PRI) +no_op_client_for_valgrind_SOURCES = no_op_client_for_valgrind.c +no_op_client_for_valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI) +no_op_client_for_valgrind_CFLAGS = $(AM_CFLAGS_PRI) +no_op_client_for_valgrind_CCASFLAGS = $(AM_CCASFLAGS_PRI) +no_op_client_for_valgrind_LDFLAGS = $(AM_CFLAGS_PRI) +# +#---------------------------------------------------------- + + noinst_HEADERS = \ $(mach_hdrs) \ launcher-aix5-bootblock.h \ @@ -225,10 +253,6 @@ m_syswrap/priv_syswrap-main.h \ m_ume/priv_ume.h -#---------------------------------------------------------------------------- -# libcoregrind_<platform>.so -#---------------------------------------------------------------------------- - BUILT_SOURCES = CLEANFILES = if VGCONF_OS_IS_DARWIN @@ -236,6 +260,7 @@ CLEANFILES += $(COREGRIND_DARWIN_BUILT_SOURCES) endif + COREGRIND_SOURCES_COMMON = \ m_commandline.c \ m_clientstate.c \ @@ -441,6 +466,40 @@ libcoregrind_amd64_darwin_a_CCASFLAGS = $(AM_CCASFLAGS_AMD64_DARWIN) +libreplacemalloc_toolpreload_x86_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c +libreplacemalloc_toolpreload_x86_linux_a_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) +libreplacemalloc_toolpreload_x86_linux_a_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) + +libreplacemalloc_toolpreload_amd64_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c +libreplacemalloc_toolpreload_amd64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) +libreplacemalloc_toolpreload_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) + +libreplacemalloc_toolpreload_ppc32_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c +libreplacemalloc_toolpreload_ppc32_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) +libreplacemalloc_toolpreload_ppc32_linux_a_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) + +libreplacemalloc_toolpreload_ppc64_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c +libreplacemalloc_toolpreload_ppc64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) +libreplacemalloc_toolpreload_ppc64_linux_a_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) + +libreplacemalloc_toolpreload_ppc32_aix5_a_SOURCES = m_replacemalloc/vg_replace_malloc.c +libreplacemalloc_toolpreload_ppc32_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) +libreplacemalloc_toolpreload_ppc32_aix5_a_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) +libreplacemalloc_toolpreload_ppc32_aix5_a_AR = $(AR) -X32 cru + +libreplacemalloc_toolpreload_ppc64_aix5_a_SOURCES = m_replacemalloc/vg_replace_malloc.c +libreplacemalloc_toolpreload_ppc64_aix5_a_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) +libreplacemalloc_toolpreload_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) +libreplacemalloc_toolpreload_ppc64_aix5_a_AR = $(AR) -X64 cru + +libreplacemalloc_toolpreload_x86_darwin_a_SOURCES = m_replacemalloc/vg_replace_malloc.c +libreplacemalloc_toolpreload_x86_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) +libreplacemalloc_toolpreload_x86_darwin_a_CFLAGS = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PIC) + +libreplacemalloc_toolpreload_amd64_darwin_a_SOURCES = m_replacemalloc/vg_replace_malloc.c +libreplacemalloc_toolpreload_amd64_darwin_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) +libreplacemalloc_toolpreload_amd64_darwin_a_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PIC) + m_dispatch/dispatch-x86-linux.S: libvex_guest_offsets.h m_dispatch/dispatch-amd64-linux.S: libvex_guest_offsets.h m_dispatch/dispatch-ppc32-linux.S: libvex_guest_offsets.h @@ -462,67 +521,47 @@ libvex_guest_offsets.h: $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" pub/libvex_guest_offsets.h -#---------------------------------------------------------------------------- -# libreplacemalloc_toolpreload_<platform>.so -#---------------------------------------------------------------------------- +VGPRELOAD_CORE_SOURCES_COMMON = vg_preloaded.c -pkglib_LIBRARIES += libreplacemalloc_toolpreload-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a -if VGCONF_HAVE_PLATFORM_SEC -pkglib_LIBRARIES += libreplacemalloc_toolpreload-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a -endif +vgpreload_core_x86_linux_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) +vgpreload_core_x86_linux_so_CPPFLAGS = $(AM_CPPFLAGS_X86_LINUX) +vgpreload_core_x86_linux_so_CFLAGS = $(AM_CFLAGS_X86_LINUX) $(AM_CFLAGS_PIC) +vgpreload_core_x86_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_X86_LINUX) -libreplacemalloc_toolpreload_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \ - m_replacemalloc/vg_replace_malloc.c -libreplacemalloc_toolpreload_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -libreplacemalloc_toolpreload_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) -if VGCONF_HAVE_PLATFORM_SEC -libreplacemalloc_toolpreload_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_SOURCES = \ - m_replacemalloc/vg_replace_malloc.c -libreplacemalloc_toolpreload_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -libreplacemalloc_toolpreload_@VGCONF_ARCH_SEC@_@VGCONF_OS@_a_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) -endif +vgpreload_core_amd64_linux_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) +vgpreload_core_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) +vgpreload_core_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_core_amd64_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_AMD64_LINUX) -# Special AR for AIX. -libreplacemalloc_toolpreload_ppc32_aix5_a_AR = $(AR) -X32 cru -libreplacemalloc_toolpreload_ppc64_aix5_a_AR = $(AR) -X64 cru +vgpreload_core_ppc32_linux_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) +vgpreload_core_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) +vgpreload_core_ppc32_linux_so_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) $(AM_CFLAGS_PIC) +vgpreload_core_ppc32_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC32_LINUX) -#---------------------------------------------------------------------------- -# vgpreload_core_<platform>.so -#---------------------------------------------------------------------------- +vgpreload_core_ppc64_linux_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) +vgpreload_core_ppc64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_LINUX) +vgpreload_core_ppc64_linux_so_CFLAGS = $(AM_CFLAGS_PPC64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_core_ppc64_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC64_LINUX) -noinst_PROGRAMS = vgpreload_core-@VGCONF_ARCH_PRI@-@VGCONF_OS@.so -if VGCONF_HAVE_PLATFORM_SEC -noinst_PROGRAMS += vgpreload_core-@VGCONF_ARCH_SEC@-@VGCONF_OS@.so -endif +vgpreload_core_ppc32_aix5_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) +vgpreload_core_ppc32_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_AIX5) +vgpreload_core_ppc32_aix5_so_CFLAGS = $(AM_CFLAGS_PPC32_AIX5) $(AM_CFLAGS_PIC) +vgpreload_core_ppc32_aix5_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC32_AIX5) -if VGCONF_OS_IS_DARWIN -noinst_DSYMS = $(noinst_PROGRAMS) -endif +vgpreload_core_ppc64_aix5_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) +vgpreload_core_ppc64_aix5_so_CPPFLAGS = $(AM_CPPFLAGS_PPC64_AIX5) +vgpreload_core_ppc64_aix5_so_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) $(AM_CFLAGS_PIC) +vgpreload_core_ppc64_aix5_so_LDFLAGS = $(PRELOAD_LDFLAGS_PPC64_AIX5) -vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = vg_preloaded.c -vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(AM_CFLAGS_PIC) -vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) -if VGCONF_HAVE_PLATFORM_SEC -vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = vg_preloaded.c -vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ - $(AM_CFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(AM_CFLAGS_PIC) -vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ - $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) -endif +vgpreload_core_x86_darwin_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) +vgpreload_core_x86_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_X86_DARWIN) +vgpreload_core_x86_darwin_so_CFLAGS = $(AM_CFLAGS_X86_DARWIN) $(AM_CFLAGS_PIC) +vgpreload_core_x86_darwin_so_LDFLAGS = $(PRELOAD_LDFLAGS_X86_DARWIN) -#---------------------------------------------------------------------------- -# General stuff -#---------------------------------------------------------------------------- +vgpreload_core_amd64_darwin_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) +vgpreload_core_amd64_darwin_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_DARWIN) +vgpreload_core_amd64_darwin_so_CFLAGS = $(AM_CFLAGS_AMD64_DARWIN) $(AM_CFLAGS_PIC) +vgpreload_core_amd64_darwin_so_LDFLAGS = $(PRELOAD_LDFLAGS_AMD64_DARWIN) all-local: inplace-noinst_PROGRAMS inplace-noinst_DSYMS @@ -530,11 +569,6 @@ $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" clean rm -f $(mach_srcs) $(mach_server_srcs) $(mach_hdrs) -LIBVEX = libvex-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a -if VGCONF_HAVE_PLATFORM_SEC -LIBVEX += libvex-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a -endif - # Nb: The loop installs the libvex library for possible use by standalone # tools. install-exec-local: install-noinst_PROGRAMS install-noinst_DSYMS Modified: trunk/drd/tests/Makefile.am =================================================================== --- trunk/drd/tests/Makefile.am 2009-06-02 05:27:07 UTC (rev 10203) +++ trunk/drd/tests/Makefile.am 2009-06-02 06:54:57 UTC (rev 10204) @@ -241,7 +241,8 @@ sem_as_mutex \ sigalrm \ thread_name \ - trylock + trylock \ + tsan_unittest if HAVE_BOOST_1_35 check_PROGRAMS += boost_thread @@ -271,9 +272,6 @@ check_PROGRAMS += qt4_mutex qt4_rwlock qt4_semaphore endif -if ! VGCONF_OS_IS_DARWIN -check_PROGRAMS += tsan_unittest -endif AM_CFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter |