diff options
| author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2010-06-02 00:31:34 +0000 |
|---|---|---|
| committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2010-06-02 00:31:34 +0000 |
| commit | 9e6428a7fbb83dd496b213d70bf8ea3370a79542 (patch) | |
| tree | e3ea40206b85de9933f428244ae707b1bc495dbb /massif | |
| parent | 8b1e68202846874b6bb6e449ac685f8d99a04635 (diff) | |
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 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'massif')
| -rw-r--r-- | massif/Makefile.am | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/massif/Makefile.am b/massif/Makefile.am index 32c54dd0..45ab681e 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 = \ |