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 /exp-bbv | |
| 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 'exp-bbv')
| -rw-r--r-- | exp-bbv/Makefile.am | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/exp-bbv/Makefile.am b/exp-bbv/Makefile.am index aa7f40b4..912e3493 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 |