|
From: <sv...@va...> - 2009-06-15 05:03:09
|
Author: njn Date: 2009-06-15 06:03:04 +0100 (Mon, 15 Jun 2009) New Revision: 10325 Log: Just move things around. Modified: branches/BUILD_TWEAKS/Makefile.tool.am Modified: branches/BUILD_TWEAKS/Makefile.tool.am =================================================================== --- branches/BUILD_TWEAKS/Makefile.tool.am 2009-06-15 04:42:11 UTC (rev 10324) +++ branches/BUILD_TWEAKS/Makefile.tool.am 2009-06-15 05:03:04 UTC (rev 10325) @@ -5,32 +5,10 @@ include $(top_srcdir)/Makefile.flags.am include $(top_srcdir)/Makefile.core-tool.am +#---------------------------------------------------------------------------- +# <tool>-<platform> stuff +#---------------------------------------------------------------------------- -LIBREPLACEMALLOC_X86_LINUX = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload-x86-linux.a - -LIBREPLACEMALLOC_AMD64_LINUX = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload-amd64-linux.a - -LIBREPLACEMALLOC_PPC32_LINUX = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc32-linux.a - -LIBREPLACEMALLOC_PPC64_LINUX = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc64-linux.a - -LIBREPLACEMALLOC_PPC32_AIX5 = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc32-aix5.a - -LIBREPLACEMALLOC_PPC64_AIX5 = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc64-aix5.a - -LIBREPLACEMALLOC_X86_DARWIN = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload-x86-darwin.a - -LIBREPLACEMALLOC_AMD64_DARWIN = \ - $(top_builddir)/coregrind/libreplacemalloc_toolpreload-amd64-darwin.a - - COREGRIND_LIBS_X86_LINUX = \ $(top_builddir)/coregrind/libcoregrind-x86-linux.a \ @VEX_DIR@/libvex-x86-linux.a @@ -64,8 +42,6 @@ @VEX_DIR@/libvex-amd64-darwin.a -##.PHONY: @VEX_DIR@/libvex.a - @VEX_DIR@/libvex-x86-linux.a: @VEX_DIR@/priv/main/vex_svnversion.h $(MAKE) -C @VEX_DIR@ CC="$(CC)" AR="$(AR)" \ libvex-x86-linux.a \ @@ -170,7 +146,35 @@ -Wl,-stack_addr,0x7fff50080000 -Wl,-stack_size,0x7ffe50080000 \ -Wl,-pagezero_size,0x100000000 +#---------------------------------------------------------------------------- +# vgpreload_<tool>-<platform>.a stuff +#---------------------------------------------------------------------------- +LIBREPLACEMALLOC_X86_LINUX = \ + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-x86-linux.a + +LIBREPLACEMALLOC_AMD64_LINUX = \ + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-amd64-linux.a + +LIBREPLACEMALLOC_PPC32_LINUX = \ + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc32-linux.a + +LIBREPLACEMALLOC_PPC64_LINUX = \ + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc64-linux.a + +LIBREPLACEMALLOC_PPC32_AIX5 = \ + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc32-aix5.a + +LIBREPLACEMALLOC_PPC64_AIX5 = \ + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-ppc64-aix5.a + +LIBREPLACEMALLOC_X86_DARWIN = \ + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-x86-darwin.a + +LIBREPLACEMALLOC_AMD64_DARWIN = \ + $(top_builddir)/coregrind/libreplacemalloc_toolpreload-amd64-darwin.a + + LIBREPLACEMALLOC_LDFLAGS_X86_LINUX = \ -Wl,--whole-archive \ $(LIBREPLACEMALLOC_X86_LINUX) \ @@ -203,8 +207,10 @@ LIBREPLACEMALLOC_LDFLAGS_AMD64_DARWIN = \ $(LIBREPLACEMALLOC_AMD64_DARWIN) +#---------------------------------------------------------------------------- +# General stuff +#---------------------------------------------------------------------------- - all-local: inplace-noinst_PROGRAMS inplace-noinst_DSYMS clean-local: clean-noinst_DSYMS |