|
From: <sv...@va...> - 2010-07-01 00:39:07
|
Author: njn Date: 2010-07-01 01:20:20 +0100 (Thu, 01 Jul 2010) New Revision: 11194 Log: 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. Added: trunk/memcheck/tests/amd64-linux/ Removed: trunk/coregrind/m_start-amd64-darwin.S trunk/coregrind/m_start-x86-darwin.S trunk/memcheck/tests/amd64/defcfaexpr.S trunk/memcheck/tests/amd64/defcfaexpr.stderr.exp trunk/memcheck/tests/amd64/defcfaexpr.vgtest trunk/memcheck/tests/amd64/int3-amd64.c trunk/memcheck/tests/amd64/int3-amd64.stderr.exp trunk/memcheck/tests/amd64/int3-amd64.stdout.exp trunk/memcheck/tests/amd64/int3-amd64.vgtest Modified: trunk/Makefile.all.am trunk/Makefile.am trunk/Makefile.tool.am trunk/auxprogs/Makefile.am trunk/cachegrind/Makefile.am trunk/callgrind/Makefile.am trunk/configure.in trunk/coregrind/Makefile.am trunk/coregrind/link_tool_exe_darwin.in trunk/coregrind/link_tool_exe_linux.in trunk/coregrind/m_main.c trunk/coregrind/m_redir.c trunk/coregrind/m_sigframe/sigframe-amd64-darwin.c trunk/coregrind/m_sigframe/sigframe-x86-darwin.c trunk/coregrind/m_signals.c trunk/coregrind/m_syswrap/priv_syswrap-darwin.h trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c trunk/coregrind/m_syswrap/syswrap-darwin.c trunk/coregrind/m_trampoline.S trunk/coregrind/m_ume/macho.c trunk/coregrind/pub_core_trampoline.h trunk/coregrind/vg_preloaded.c trunk/darwin9-drd.supp trunk/drd/Makefile.am trunk/drd/tests/tsan_unittest.cpp trunk/exp-bbv/Makefile.am trunk/exp-ptrcheck/Makefile.am trunk/helgrind/Makefile.am trunk/include/vki/vki-darwin.h trunk/include/vki/vki-scnums-darwin.h trunk/lackey/Makefile.am trunk/massif/Makefile.am trunk/memcheck/Makefile.am trunk/memcheck/tests/Makefile.am trunk/memcheck/tests/amd64/Makefile.am trunk/memcheck/tests/amd64/xor-undef-amd64.stderr.exp trunk/memcheck/tests/amd64/xor-undef-amd64.vgtest trunk/none/Makefile.am [... diff too large to include ...] |