Author: njn Date: 2009-05-28 02:53:07 +0100 (Thu, 28 May 2009) New Revision: 10156 Log: Merge the DARWIN branch onto the trunk. I tried using 'svn merge' to do the merge but it did a terrible job and there were bazillions of conflicts. So instead I just took the diff between the branch and trunk at r10155, applied the diff to the trunk, 'svn add'ed the added files (no files needed to be 'svn remove'd) and committed. Added: trunk/coregrind/launcher-darwin.c trunk/coregrind/m_coredump/coredump-amd64-darwin.c trunk/coregrind/m_coredump/coredump-x86-darwin.c trunk/coregrind/m_debuginfo/priv_readmacho.h trunk/coregrind/m_debuginfo/readmacho.c trunk/coregrind/m_dispatch/dispatch-amd64-darwin.S trunk/coregrind/m_dispatch/dispatch-x86-darwin.S trunk/coregrind/m_initimg/initimg-darwin.c trunk/coregrind/m_mach/ trunk/coregrind/m_mach/mach_basics.c trunk/coregrind/m_mach/mach_msg.c trunk/coregrind/m_mach/mach_traps-amd64-darwin.S trunk/coregrind/m_mach/mach_traps-x86-darwin.S trunk/coregrind/m_sigframe/sigframe-amd64-darwin.c trunk/coregrind/m_sigframe/sigframe-x86-darwin.c trunk/coregrind/m_start-amd64-darwin.S trunk/coregrind/m_start-x86-darwin.S trunk/coregrind/m_syswrap/priv_syswrap-darwin.h trunk/coregrind/m_syswrap/syscall-amd64-darwin.S trunk/coregrind/m_syswrap/syscall-x86-darwin.S trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c trunk/coregrind/m_syswrap/syswrap-darwin.c trunk/coregrind/m_syswrap/syswrap-x86-darwin.c trunk/coregrind/m_ume/macho.c trunk/coregrind/pub_core_mach.h trunk/darwin9.supp trunk/docs/internals/Darwin-notes.txt trunk/include/vki/vki-darwin.h trunk/include/vki/vki-scnums-darwin.h trunk/memcheck/tests/darwin/ trunk/memcheck/tests/darwin/Makefile.am trunk/memcheck/tests/darwin/filter_stderr trunk/memcheck/tests/darwin/scalar.c trunk/memcheck/tests/darwin/scalar.h trunk/memcheck/tests/darwin/scalar.stderr.exp trunk/memcheck/tests/darwin/scalar.vgtest trunk/memcheck/tests/darwin/scalar_fork.c trunk/memcheck/tests/darwin/scalar_fork.stderr.exp trunk/memcheck/tests/darwin/scalar_fork.vgtest trunk/memcheck/tests/darwin/scalar_vfork.c trunk/memcheck/tests/darwin/scalar_vfork.stderr.exp trunk/memcheck/tests/darwin/scalar_vfork.vgtest trunk/memcheck/tests/origin1-yes.stderr.exp-darwin trunk/memcheck/tests/sigkill.stderr.exp-darwin trunk/memcheck/tests/strchr.stderr.exp-darwin trunk/none/tests/darwin/ trunk/none/tests/darwin/Makefile.am trunk/none/tests/darwin/apple-main-arg.c trunk/none/tests/darwin/apple-main-arg.stderr.exp trunk/none/tests/darwin/apple-main-arg.vgtest trunk/none/tests/darwin/filter_stderr trunk/none/tests/darwin/rlimit.c trunk/none/tests/darwin/rlimit.stderr.exp trunk/none/tests/darwin/rlimit.vgtest Modified: trunk/Makefile.am trunk/Makefile.core-tool.am trunk/Makefile.flags.am trunk/Makefile.tool-tests.am trunk/Makefile.tool.am trunk/NEWS trunk/auxprogs/Makefile.am trunk/cachegrind/Makefile.am trunk/cachegrind/cg_main.c trunk/cachegrind/tests/Makefile.am trunk/callgrind/Makefile.am trunk/configure.in trunk/coregrind/Makefile.am trunk/coregrind/m_aspacemgr/aspacemgr-common.c trunk/coregrind/m_aspacemgr/aspacemgr-linux.c trunk/coregrind/m_debugger.c trunk/coregrind/m_debuginfo/d3basics.c trunk/coregrind/m_debuginfo/debuginfo.c trunk/coregrind/m_debuginfo/priv_storage.h trunk/coregrind/m_debuginfo/readdwarf.c trunk/coregrind/m_debuginfo/readdwarf3.c trunk/coregrind/m_debuginfo/readstabs.c trunk/coregrind/m_debuginfo/storage.c trunk/coregrind/m_debuglog.c trunk/coregrind/m_libcassert.c trunk/coregrind/m_libcbase.c trunk/coregrind/m_libcfile.c trunk/coregrind/m_libcproc.c trunk/coregrind/m_libcsignal.c trunk/coregrind/m_machine.c trunk/coregrind/m_main.c trunk/coregrind/m_options.c trunk/coregrind/m_redir.c trunk/coregrind/m_replacemalloc/vg_replace_malloc.c trunk/coregrind/m_scheduler/priv_sema.h trunk/coregrind/m_scheduler/scheduler.c trunk/coregrind/m_scheduler/sema.c trunk/coregrind/m_signals.c trunk/coregrind/m_stacktrace.c trunk/coregrind/m_syscall.c trunk/coregrind/m_syswrap/priv_syswrap-main.h trunk/coregrind/m_syswrap/priv_types_n_macros.h trunk/coregrind/m_syswrap/syswrap-generic.c trunk/coregrind/m_syswrap/syswrap-main.c trunk/coregrind/m_trampoline.S trunk/coregrind/m_translate.c trunk/coregrind/m_ume/elf.c trunk/coregrind/m_ume/main.c trunk/coregrind/m_ume/priv_ume.h trunk/coregrind/m_vki.c trunk/coregrind/pub_core_aspacemgr.h trunk/coregrind/pub_core_debuginfo.h trunk/coregrind/pub_core_initimg.h trunk/coregrind/pub_core_machine.h trunk/coregrind/pub_core_mallocfree.h trunk/coregrind/pub_core_options.h trunk/coregrind/pub_core_scheduler.h trunk/coregrind/pub_core_syscall.h trunk/coregrind/pub_core_syswrap.h trunk/coregrind/pub_core_threadstate.h trunk/coregrind/pub_core_trampoline.h trunk/coregrind/pub_core_ume.h trunk/coregrind/pub_core_vkiscnums.h trunk/coregrind/vg_preloaded.c trunk/docs/internals/Makefile.am trunk/drd/Makefile.am trunk/drd/drd_main.c trunk/drd/drd_pthread_intercepts.c trunk/drd/tests/recursive_mutex.c trunk/exp-omega/Makefile.am trunk/exp-ptrcheck/Makefile.am trunk/exp-ptrcheck/h_main.c trunk/exp-ptrcheck/pc_main.c trunk/exp-ptrcheck/tests/Makefile.am trunk/glibc-2.34567-NPTL-helgrind.supp trunk/helgrind/Makefile.am trunk/helgrind/hg_intercepts.c trunk/helgrind/hg_main.c trunk/helgrind/tests/Makefile.am trunk/helgrind/tests/tc20_verifywrap.c trunk/include/pub_tool_basics.h trunk/include/pub_tool_basics_asm.h trunk/include/pub_tool_libcbase.h trunk/include/pub_tool_libcfile.h trunk/include/pub_tool_machine.h trunk/include/pub_tool_redir.h trunk/include/pub_tool_tooliface.h trunk/include/pub_tool_vki.h trunk/include/pub_tool_vkiscnums.h trunk/include/valgrind.h trunk/include/vki/Makefile.am trunk/lackey/Makefile.am trunk/massif/Makefile.am trunk/massif/ms_main.c trunk/massif/tests/malloc_usable.c trunk/memcheck/Makefile.am trunk/memcheck/mc_errors.c trunk/memcheck/mc_machine.c trunk/memcheck/mc_main.c trunk/memcheck/mc_replace_strmem.c trunk/memcheck/tests/Makefile.am trunk/memcheck/tests/amd64/Makefile.am trunk/memcheck/tests/badjump2.c trunk/memcheck/tests/linux/Makefile.am trunk/memcheck/tests/malloc_usable.c trunk/memcheck/tests/memalign2.c trunk/memcheck/tests/origin1-yes.c trunk/memcheck/tests/origin1-yes.stderr.exp trunk/memcheck/tests/stack_changes.c trunk/memcheck/tests/str_tester.c trunk/memcheck/tests/x86/Makefile.am trunk/none/Makefile.am trunk/none/tests/Makefile.am trunk/none/tests/amd64/Makefile.am trunk/none/tests/pth_atfork1.c trunk/none/tests/x86/Makefile.am trunk/tests/Makefile.am trunk/tests/arch_test.c trunk/tests/asm.h trunk/tests/filter_libc trunk/tests/malloc.h trunk/tests/os_test.c trunk/tests/platform_test trunk/tests/sys_mman.h trunk/tests/x86_amd64_features.c [... diff too large to include ...] |