From c46347280bb9cc7f3436eef50f6450c85c968a0a Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Wed, 2 Jun 2010 00:31:34 +0000 Subject: [PATCH] Add a new program (link_tool_exe.c) and use this to link the tool executables. Gets rid of the linker script kludgery and uniformly uses -Ttext=0x38000000 (or whatever) on Linux, so as to accomodate both traditional ld and gold. Should fix #193413 although I have been unable to test it. Using a whole new program seems like overkill, but this is infrastructure to support static linking of the tool executables on MacOS too. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11141 --- Makefile.all.am | 10 +++- Makefile.tool.am | 116 ++++---------------------------------- cachegrind/Makefile.am | 13 +++++ callgrind/Makefile.am | 13 +++++ coregrind/Makefile.am | 21 +++++++ coregrind/link_tool_exe.c | 104 ++++++++++++++++++++++++++++++++++ drd/Makefile.am | 20 ++++++- exp-bbv/Makefile.am | 19 ++++++- exp-ptrcheck/Makefile.am | 14 +++++ helgrind/Makefile.am | 20 ++++++- lackey/Makefile.am | 19 ++++++- massif/Makefile.am | 20 ++++++- memcheck/Makefile.am | 20 ++++++- none/Makefile.am | 19 ++++++- 14 files changed, 306 insertions(+), 122 deletions(-) create mode 100644 coregrind/link_tool_exe.c diff --git a/Makefile.all.am b/Makefile.all.am index 15efa86008..6ededaa7ae 100644 --- a/Makefile.all.am +++ b/Makefile.all.am @@ -37,8 +37,10 @@ build-noinst_DSYMS: $(noinst_DSYMS) inplace-noinst_PROGRAMS: $(noinst_PROGRAMS) mkdir -p $(inplacedir); \ for f in $(noinst_PROGRAMS) ; do \ - rm -f $(inplacedir)/$$f; \ - ln -f -s ../$(subdir)/$$f $(inplacedir); \ + if [ $$f != link_tool_exe ] ; then \ + rm -f $(inplacedir)/$$f; \ + ln -f -s ../$(subdir)/$$f $(inplacedir); \ + fi; \ done # Similar to inplace-noinst_PROGRAMS @@ -55,7 +57,9 @@ inplace-noinst_DSYMS: build-noinst_DSYMS install-noinst_PROGRAMS: $(noinst_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(pkglibdir); \ for f in $(noinst_PROGRAMS); do \ - $(INSTALL_PROGRAM) $$f $(DESTDIR)$(pkglibdir); \ + if [ $$f != link_tool_exe ] ; then \ + $(INSTALL_PROGRAM) $$f $(DESTDIR)$(pkglibdir); \ + fi; \ done # Similar to install-noinst_PROGRAMS. diff --git a/Makefile.tool.am b/Makefile.tool.am index 9e607b815b..36cdd6cc4f 100644 --- a/Makefile.tool.am +++ b/Makefile.tool.am @@ -26,32 +26,28 @@ TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \ endif -TOOL_LDFLAGS_COMMON_LINUX = -static \ - -Wl,-defsym,valt_load_address=@VALT_LOAD_ADDRESS@ \ - -nodefaultlibs -nostartfiles -u _start -TOOL_LDFLAGS_COMMON_AIX5 = -static -Wl,-e_start_valgrind -TOOL_LDFLAGS_COMMON_DARWIN = -nodefaultlibs -nostartfiles \ +TOOL_LDFLAGS_COMMON_LINUX = \ + -static -nodefaultlibs -nostartfiles -u _start +TOOL_LDFLAGS_COMMON_AIX5 = \ + -static -Wl,-e_start_valgrind +TOOL_LDFLAGS_COMMON_DARWIN = \ + -nodefaultlibs -nostartfiles \ -Wl,-u,__start -Wl,-e,__start -Wl,-bind_at_load /usr/lib/dyld TOOL_LDFLAGS_X86_LINUX = \ - $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ \ - -Wl,-T,$(top_builddir)/valt_load_address_x86_linux.lds + $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ TOOL_LDFLAGS_AMD64_LINUX = \ - $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M64@ \ - -Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds + $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M64@ TOOL_LDFLAGS_PPC32_LINUX = \ - $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ \ - -Wl,-T,$(top_builddir)/valt_load_address_ppc32_linux.lds + $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ TOOL_LDFLAGS_PPC64_LINUX = \ - $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M64@ \ - -Wl,-T,$(top_builddir)/valt_load_address_ppc64_linux.lds + $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M64@ TOOL_LDFLAGS_ARM_LINUX = \ - $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ \ - -Wl,-T,$(top_builddir)/valt_load_address_arm_linux.lds + $(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@ TOOL_LDFLAGS_PPC32_AIX5 = \ $(TOOL_LDFLAGS_COMMON_AIX5) @FLAG_MAIX32@ @@ -74,96 +70,6 @@ TOOL_LDFLAGS_AMD64_DARWIN = \ -Wl,-pagezero_size,0x100000000 -BUILT_SOURCES = -CLEANFILES = -if VGCONF_PLATFORMS_INCLUDE_X86_LINUX -BUILT_SOURCES += $(top_builddir)/valt_load_address_x86_linux.lds -CLEANFILES += $(top_builddir)/valt_load_address_x86_linux.lds -endif -if VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX -BUILT_SOURCES += $(top_builddir)/valt_load_address_amd64_linux.lds -CLEANFILES += $(top_builddir)/valt_load_address_amd64_linux.lds -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX -BUILT_SOURCES += $(top_builddir)/valt_load_address_ppc32_linux.lds -CLEANFILES += $(top_builddir)/valt_load_address_ppc32_linux.lds -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX -BUILT_SOURCES += $(top_builddir)/valt_load_address_ppc64_linux.lds -CLEANFILES += $(top_builddir)/valt_load_address_ppc64_linux.lds -endif -if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX -BUILT_SOURCES += $(top_builddir)/valt_load_address_arm_linux.lds -CLEANFILES += $(top_builddir)/valt_load_address_arm_linux.lds -endif -if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5 -# No need to generate $(top_builddir)/valt_load_address*.lds; the final -# executables can be linked to be at any address. They will be relocated by -# AIX kernel when they are loaded. -endif -if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5 -# Ditto -endif -if VGCONF_OS_IS_DARWIN -# GrP untested, possibly hopeless -endif - - -# Generate a linker script for linking the binaries. This is the -# standard gcc linker script, except hacked so that an alternative -# load address can be specified by (1) asking gcc to use this script -# (-Wl,-T,valt_load_address.lds) and (2) setting the symbol -# valt_load_address to the required value -# (-Wl,-defsym,valt_load_address=0x70000000). -# -# Extract ld's default linker script and hack it to our needs. -# First we cut everything above and below the "=====..." lines at the top -# and bottom. -# Then we have to replace the load address with "valt_load_address". -# The line to replace in has one of the following two forms: -# -# . = 0x08048000 + SIZEOF_HEADERS; -# -# or -# PROVIDE (__executable_start = 0x08048000); . = 0x08048000 + SIZEOF_HEADERS; -# -# So we search for the line with a hex value "+ SIZEOF_HEADERS", and replace -# all the hex values in that line with "valt_load_address". -$(top_builddir)/valt_load_address_x86_linux.lds: Makefile - $(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | sed \ - -e '1,/^=====\+$$/d' \ - -e '/^=====\+$$/,/.\*/d' \ - -e '/\. = \(0x[0-9A-Fa-f]\+\|SEGMENT_START("[^"]\+", 0x[0-9A-Fa-f]\+)\) + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ - || rm -f $@ - -$(top_builddir)/valt_load_address_amd64_linux.lds: Makefile - $(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | sed \ - -e '1,/^=====\+$$/d' \ - -e '/^=====\+$$/,/.\*/d' \ - -e '/\. = \(0x[0-9A-Fa-f]\+\|SEGMENT_START("[^"]\+", 0x[0-9A-Fa-f]\+)\) + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ - || rm -f $@ - -$(top_builddir)/valt_load_address_ppc32_linux.lds: Makefile - $(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | sed \ - -e '1,/^=====\+$$/d' \ - -e '/^=====\+$$/,/.\*/d' \ - -e '/\. = \(0x[0-9A-Fa-f]\+\|SEGMENT_START("[^"]\+", 0x[0-9A-Fa-f]\+)\) + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ - || rm -f $@ - -$(top_builddir)/valt_load_address_ppc64_linux.lds: Makefile - $(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | sed \ - -e '1,/^=====\+$$/d' \ - -e '/^=====\+$$/,/.\*/d' \ - -e '/\. = \(0x[0-9A-Fa-f]\+\|SEGMENT_START("[^"]\+", 0x[0-9A-Fa-f]\+)\) + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ - || rm -f $@ - -$(top_builddir)/valt_load_address_arm_linux.lds: Makefile - $(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | sed \ - -e '1,/^=====\+$$/d' \ - -e '/^=====\+$$/,/.\*/d' \ - -e '/\. = \(0x[0-9A-Fa-f]\+\|SEGMENT_START("[^"]\+", 0x[0-9A-Fa-f]\+)\) + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ - || rm -f $@ - #---------------------------------------------------------------------------- # vgpreload_-.a stuff #---------------------------------------------------------------------------- diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am index fc1c4007da..fcb5ec0958 100644 --- a/cachegrind/Makefile.am +++ b/cachegrind/Makefile.am @@ -55,6 +55,13 @@ cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(cachegrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ $(CACHEGRIND_SOURCES_COMMON) @@ -68,6 +75,12 @@ cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(cachegrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif diff --git a/callgrind/Makefile.am b/callgrind/Makefile.am index 59e4d03f40..5efe66167e 100644 --- a/callgrind/Makefile.am +++ b/callgrind/Makefile.am @@ -65,6 +65,13 @@ callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ $(CALLGRIND_SOURCES_COMMON) @@ -78,5 +85,11 @@ callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am index 4af776cf5c..8a9ddac142 100644 --- a/coregrind/Makefile.am +++ b/coregrind/Makefile.am @@ -421,6 +421,27 @@ vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) endif +#---------------------------------------------------------------------------- +# link_tool_exe, the wrapper for the system linker +#---------------------------------------------------------------------------- + +noinst_PROGRAMS += link_tool_exe + +link_tool_exe_SOURCES = link_tool_exe.c +link_tool_exe_CPPFLAGS = $(AM_CPPFLAGS_PRI) +link_tool_exe_CFLAGS = $(AM_CFLAGS_PRI) +link_tool_exe_CCASFLAGS = $(AM_CCASFLAGS_PRI) +link_tool_exe_LDFLAGS = $(AM_CFLAGS_PRI) + +# force link_tool_exe to be built before libcoregrind.a is, and hence +# before any of the tool executables are linked, since they in turn +# are dependent on libcoregrind.a. Unfortunately this doesn't give a +# dependence on link_tool_exe.c: ideally if link_tool_exe.c is +# changed, then 'make' rebuilds link_tool_exe, but the tool +# executables themselves are not relinked. I can't figure out how +# to get that to happen. +BUILT_SOURCES += link_tool_exe + #---------------------------------------------------------------------------- # General stuff #---------------------------------------------------------------------------- diff --git a/coregrind/link_tool_exe.c b/coregrind/link_tool_exe.c new file mode 100644 index 0000000000..e858a98d91 --- /dev/null +++ b/coregrind/link_tool_exe.c @@ -0,0 +1,104 @@ + +/* This program handles linking the tool executables, statically and + at an alternative load address. Linking them statically sidesteps + all sorts of complications to do with having two copies of the + dynamic linker (valgrind's and the client's) coexisting in the same + process. The alternative load address is needed because Valgrind + itself will load the client at whatever address it specifies, which + is almost invariably the default load address. Hence we can't + allow Valgrind itself (viz, the tool executable) to be loaded at + that address. + + Unfortunately there's no standard way to do 'static link at + alternative address', so this program handles the per-platform + hoop-jumping. +*/ + +/* What we get passed here is: + first arg + the alternative load address + all the rest of the args + the gcc invokation to do the final link, that + the build system would have done, left to itself + + We just let assertions fail rather than do proper error reporting. + We don't expect the users to run this directly. It is only run + from as part of the build process, with carefully constrained + inputs. +*/ + +#if defined(VGO_linux) + +// Don't NDEBUG this; the asserts are necesary for +// safety checks. +#include +#include +#include +#include + +int main ( int argc, char** argv ) +{ + int i; + size_t reqd = 0; + + // expect at least: alt-load-address gcc -o foo bar.o + assert(argc > 5); + + // check for plausible-ish alt load address + char* ala = argv[1]; + assert(ala[0] == '0'); + assert(ala[1] == 'x'); + + // We'll need to invoke this to do the linking + char* gcc = argv[2]; + + // and the 'restargs' are argv[3 ..] + + // so, build up the complete command here: + // 'gcc' -static -Ttext='ala' 'restargs' + + // first, do length safety checks + reqd += 1+ strlen(gcc); + reqd += 1+ 100/*let's say*/ + strlen(ala); + for (i = 3; i < argc; i++) + reqd += 1+ strlen(argv[i]); + + reqd += 1; + char* cmd = calloc(reqd,1); + assert(cmd); + + char ttext[100]; + assert(strlen(ala) < 30); + memset(ttext, 0, sizeof(ttext)); + sprintf(ttext, " -static -Wl,-Ttext=%s", ala); + + strcpy(cmd, gcc); + strcat(cmd, ttext); + for (i = 3; i < argc; i++) { + strcat(cmd, " "); + strcat(cmd, argv[i]); + } + + assert(cmd[reqd-1] == 0); + + if (0) printf("\n"); + printf("link_tool_exe: %s\n", cmd); + if (0) printf("\n"); + + int r = system(cmd); + + free(cmd); + + // return the result of system. Note, we should handle it + // properly; that would involve using WEXITSTATUS on the + // value system gives back to us. + return r; +} + +#elif defined(VGO_darwin) + +#error Daaaawin + +#else +# error "Unsupported OS" +#endif diff --git a/drd/Makefile.am b/drd/Makefile.am index c54d665eca..f1c3eb3ade 100644 --- a/drd/Makefile.am +++ b/drd/Makefile.am @@ -66,7 +66,8 @@ DRD_SOURCES_COMMON = \ drd_semaphore.c \ drd_suppression.c -drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(DRD_SOURCES_COMMON) +drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \ + $(DRD_SOURCES_COMMON) drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ @@ -77,8 +78,16 @@ drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC -drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(DRD_SOURCES_COMMON) +drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ + $(DRD_SOURCES_COMMON) drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ @@ -89,6 +98,12 @@ drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif #---------------------------------------------------------------------------- @@ -120,6 +135,7 @@ vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ vgpreload_drd_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) + if VGCONF_HAVE_PLATFORM_SEC vgpreload_drd_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ $(VGPRELOAD_DRD_SOURCES_COMMON) diff --git a/exp-bbv/Makefile.am b/exp-bbv/Makefile.am index aa7f40b410..912e3493e3 100644 --- a/exp-bbv/Makefile.am +++ b/exp-bbv/Makefile.am @@ -13,7 +13,8 @@ endif BBV_SOURCES_COMMON = bbv_main.c -exp_bbv_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(BBV_SOURCES_COMMON) +exp_bbv_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \ + $(BBV_SOURCES_COMMON) exp_bbv_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) exp_bbv_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ @@ -24,8 +25,16 @@ exp_bbv_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) exp_bbv_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +exp_bbv_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(exp_bbv_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(exp_bbv_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC -exp_bbv_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(BBV_SOURCES_COMMON) +exp_bbv_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ + $(BBV_SOURCES_COMMON) exp_bbv_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) exp_bbv_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ @@ -36,4 +45,10 @@ exp_bbv_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) exp_bbv_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +exp_bbv_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(exp_bbv_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(exp_bbv_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif diff --git a/exp-ptrcheck/Makefile.am b/exp-ptrcheck/Makefile.am index 5a9ffa4a17..74c1c90489 100644 --- a/exp-ptrcheck/Makefile.am +++ b/exp-ptrcheck/Makefile.am @@ -38,6 +38,13 @@ exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ $(EXP_PTRCHECK_SOURCES_COMMON) @@ -51,6 +58,12 @@ exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif #---------------------------------------------------------------------------- @@ -79,6 +92,7 @@ vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ vgpreload_exp_ptrcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) + if VGCONF_HAVE_PLATFORM_SEC vgpreload_exp_ptrcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ $(VGPRELOAD_EXP_PTRCHECK_SOURCES_COMMON) diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am index 795266a1a7..b5d58c49c7 100644 --- a/helgrind/Makefile.am +++ b/helgrind/Makefile.am @@ -35,7 +35,8 @@ HELGRIND_SOURCES_COMMON = \ hg_wordset.c \ libhb_core.c -helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(HELGRIND_SOURCES_COMMON) +helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \ + $(HELGRIND_SOURCES_COMMON) helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ @@ -46,8 +47,16 @@ helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC -helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(HELGRIND_SOURCES_COMMON) +helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ + $(HELGRIND_SOURCES_COMMON) helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ @@ -58,6 +67,12 @@ helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif #---------------------------------------------------------------------------- @@ -86,6 +101,7 @@ vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ vgpreload_helgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) + if VGCONF_HAVE_PLATFORM_SEC vgpreload_helgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ $(VGPRELOAD_HELGRIND_SOURCES_COMMON) diff --git a/lackey/Makefile.am b/lackey/Makefile.am index ba38e70482..01a5a3ed45 100644 --- a/lackey/Makefile.am +++ b/lackey/Makefile.am @@ -13,7 +13,8 @@ endif LACKEY_SOURCES_COMMON = lk_main.c -lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(LACKEY_SOURCES_COMMON) +lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \ + $(LACKEY_SOURCES_COMMON) lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ @@ -24,8 +25,16 @@ lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(lackey_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC -lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(LACKEY_SOURCES_COMMON) +lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ + $(LACKEY_SOURCES_COMMON) lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ @@ -36,5 +45,11 @@ lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(lackey_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif diff --git a/massif/Makefile.am b/massif/Makefile.am index 32c54dd032..45ab681e78 100644 --- a/massif/Makefile.am +++ b/massif/Makefile.am @@ -23,7 +23,8 @@ endif MASSIF_SOURCES_COMMON = ms_main.c -massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(MASSIF_SOURCES_COMMON) +massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \ + $(MASSIF_SOURCES_COMMON) massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ @@ -34,8 +35,16 @@ massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC -massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(MASSIF_SOURCES_COMMON) +massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ + $(MASSIF_SOURCES_COMMON) massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ @@ -46,6 +55,12 @@ massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif #---------------------------------------------------------------------------- @@ -71,6 +86,7 @@ vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ vgpreload_massif_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) + if VGCONF_HAVE_PLATFORM_SEC vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = vgpreload_massif_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am index 50849c568a..376a71a8a8 100644 --- a/memcheck/Makefile.am +++ b/memcheck/Makefile.am @@ -31,7 +31,8 @@ MEMCHECK_SOURCES_COMMON = \ mc_machine.c \ mc_errors.c -memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(MEMCHECK_SOURCES_COMMON) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \ + $(MEMCHECK_SOURCES_COMMON) memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ @@ -42,8 +43,16 @@ memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC -memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(MEMCHECK_SOURCES_COMMON) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ + $(MEMCHECK_SOURCES_COMMON) memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ @@ -54,6 +63,12 @@ memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif mc_main.o: CFLAGS += -fomit-frame-pointer @@ -84,6 +99,7 @@ vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_DEPENDENCIES = \ vgpreload_memcheck_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) \ $(LIBREPLACEMALLOC_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) + if VGCONF_HAVE_PLATFORM_SEC vgpreload_memcheck_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = \ $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) diff --git a/none/Makefile.am b/none/Makefile.am index a1affd3457..ff335ae5ac 100644 --- a/none/Makefile.am +++ b/none/Makefile.am @@ -13,7 +13,8 @@ endif NONE_SOURCES_COMMON = nl_main.c -none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = $(NONE_SOURCES_COMMON) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_SOURCES = \ + $(NONE_SOURCES_COMMON) none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS = \ @@ -24,8 +25,16 @@ none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@) none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) +none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ + $(none_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) + if VGCONF_HAVE_PLATFORM_SEC -none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = $(NONE_SOURCES_COMMON) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_SOURCES = \ + $(NONE_SOURCES_COMMON) none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CPPFLAGS = \ $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS = \ @@ -36,6 +45,12 @@ none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDADD = \ $(TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@) none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS = \ $(TOOL_LDFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) +none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LINK = \ + $(top_builddir)/coregrind/link_tool_exe \ + @VALT_LOAD_ADDRESS@ \ + $(LINK) \ + $(none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ + $(none_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) endif -- 2.47.2