diff options
| author | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2010-07-01 00:20:20 +0000 |
|---|---|---|
| committer | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2010-07-01 00:20:20 +0000 |
| commit | ea2d6fd6aaf98d261df9fdf580542ebf01b7fba4 (patch) | |
| tree | 20887e7d96d85c74a9b47009c5d59f9725f7b7bb /callgrind | |
| parent | 69d495de9c26f1b99c9af8b2d366a09f23b47b76 (diff) | |
Merged the MACOSX106 branch to the trunk. Merge command:
svn merge -r11143:HEAD svn://svn.valgrind.org/valgrind/branches/MACOSX106
There were some easy-to-resolve conflicts.
Then I had to fix up coregrind/link_tool_exe*.in -- those files had been
added independently on both the trunk and the branch, AFAICT. I just
overwrote the trunk versions with the branch versions.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11194 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'callgrind')
| -rw-r--r-- | callgrind/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/callgrind/Makefile.am b/callgrind/Makefile.am index bbc8434a..74f3597a 100644 --- a/callgrind/Makefile.am +++ b/callgrind/Makefile.am @@ -67,7 +67,7 @@ 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_@VGCONF_OS@ \ - @VALT_LOAD_ADDRESS@ \ + @VALT_LOAD_ADDRESS_PRI@ \ $(LINK) \ $(callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CFLAGS) \ $(callgrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS) @@ -87,7 +87,7 @@ 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_@VGCONF_OS@ \ - @VALT_LOAD_ADDRESS@ \ + @VALT_LOAD_ADDRESS_SEC@ \ $(LINK) \ $(callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_CFLAGS) \ $(callgrind_@VGCONF_ARCH_SEC@_@VGCONF_OS@_LDFLAGS) |