|
From: <sv...@va...> - 2005-09-27 19:20:40
|
Author: sewardj Date: 2005-09-27 20:20:21 +0100 (Tue, 27 Sep 2005) New Revision: 4789 Log: This commit merges in changes from branches/ASPACEM (specifically, changes from r4341 through r4787 inclusive). That branch is now dead. Please do not commit anything else to it. For the most part the merge was not troublesome. The main areas of uncertainty are: - build system: I had to import by hand Makefile.core-AM_CPPFLAGS.am and include it in a couple of places. Building etc seems to still work, but I haven't tried building the documentation. - syscall wrappers: Following analysis by Greg & Nick, a whole lot of stuff was moved from -generic to -linux after the branch was created. I think that is satisfactorily glued back together now. - Regtests: although this appears to work, no .out files appear, which is strange, and makes it hard to diagnose regtest failures. In particular memcheck/tests/x86/scalar.stderr.exp remains in a=20 conflicted state. - amd64 is broken (slightly), and ppc32 will be unbuildable. I'll attend to the former shortly. Added: trunk/Makefile.core-AM_CPPFLAGS.am trunk/coregrind/m_clientstate.c trunk/coregrind/m_commandline.c trunk/coregrind/m_launcher.c trunk/coregrind/pub_core_basics_asm.h trunk/coregrind/pub_core_clientstate.h trunk/coregrind/pub_core_commandline.h trunk/include/pub_tool_clientstate.h trunk/none/tests/mremap2.c trunk/none/tests/mremap2.stderr.exp trunk/none/tests/mremap2.stdout.exp trunk/none/tests/mremap2.vgtest Removed: trunk/coregrind/m_aspacemgr/Makefile.am trunk/coregrind/m_debuginfo/Makefile.am trunk/coregrind/m_demangle/Makefile.am trunk/coregrind/m_dispatch/Makefile.am trunk/coregrind/m_libcmman.c trunk/coregrind/m_replacemalloc/Makefile.am trunk/coregrind/m_scheduler/Makefile.am trunk/coregrind/m_sigframe/Makefile.am trunk/coregrind/m_syswrap/Makefile.am trunk/coregrind/pub_core_libcmman.h trunk/coregrind/stage1.c trunk/include/pub_tool_libcmman.h Modified: trunk/Makefile.am trunk/Makefile.tool.am trunk/README_DEVELOPERS trunk/auxprogs/Makefile.am trunk/cachegrind/Makefile.am trunk/cachegrind/cg_annotate.in trunk/cachegrind/cg_main.c trunk/configure.in trunk/coregrind/Makefile.am trunk/coregrind/m_aspacemgr/aspacemgr.c trunk/coregrind/m_aspacemgr/read_procselfmaps.c trunk/coregrind/m_cpuid.S trunk/coregrind/m_debugger.c trunk/coregrind/m_debuginfo/symtab.c trunk/coregrind/m_debuginfo/symtypes.c trunk/coregrind/m_debuglog.c trunk/coregrind/m_demangle/cp-demangle.c trunk/coregrind/m_demangle/cplus-dem.c trunk/coregrind/m_demangle/safe-ctype.c trunk/coregrind/m_dispatch/dispatch-amd64.S trunk/coregrind/m_dispatch/dispatch-ppc32.S trunk/coregrind/m_dispatch/dispatch-x86.S trunk/coregrind/m_libcassert.c trunk/coregrind/m_libcbase.c trunk/coregrind/m_libcfile.c trunk/coregrind/m_libcprint.c trunk/coregrind/m_libcproc.c trunk/coregrind/m_main.c trunk/coregrind/m_mallocfree.c trunk/coregrind/m_redir.c trunk/coregrind/m_scheduler/scheduler.c trunk/coregrind/m_sigframe/sigframe-amd64-linux.c trunk/coregrind/m_sigframe/sigframe-ppc32-linux.c trunk/coregrind/m_sigframe/sigframe-x86-linux.c trunk/coregrind/m_signals.c trunk/coregrind/m_skiplist.c trunk/coregrind/m_stacks.c trunk/coregrind/m_stacktrace.c trunk/coregrind/m_syscall.c trunk/coregrind/m_syswrap/priv_syswrap-generic.h trunk/coregrind/m_syswrap/syscall-amd64-linux.S trunk/coregrind/m_syswrap/syscall-ppc32-linux.S trunk/coregrind/m_syswrap/syscall-x86-linux.S trunk/coregrind/m_syswrap/syswrap-amd64-linux.c trunk/coregrind/m_syswrap/syswrap-generic.c trunk/coregrind/m_syswrap/syswrap-linux.c trunk/coregrind/m_syswrap/syswrap-main.c trunk/coregrind/m_syswrap/syswrap-ppc32-linux.c trunk/coregrind/m_syswrap/syswrap-x86-linux.c trunk/coregrind/m_tooliface.c trunk/coregrind/m_trampoline.S trunk/coregrind/m_translate.c trunk/coregrind/m_transtab.c trunk/coregrind/m_ume.c trunk/coregrind/pub_core_aspacemgr.h trunk/coregrind/pub_core_basics.h trunk/coregrind/pub_core_debuginfo.h trunk/coregrind/pub_core_libcfile.h trunk/coregrind/pub_core_libcproc.h trunk/coregrind/pub_core_main.h trunk/coregrind/pub_core_mallocfree.h trunk/coregrind/pub_core_redir.h trunk/coregrind/pub_core_replacemalloc.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_tooliface.h trunk/coregrind/pub_core_transtab.h trunk/coregrind/pub_core_ume.h trunk/helgrind/hg_main.c trunk/include/Makefile.am trunk/include/pub_tool_aspacemgr.h 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_libcprint.h trunk/include/pub_tool_libcproc.h trunk/include/pub_tool_mallocfree.h trunk/include/pub_tool_tooliface.h trunk/include/vki-amd64-linux.h trunk/include/vki-linux.h trunk/lackey/Makefile.am trunk/lackey/lk_main.c trunk/massif/Makefile.am trunk/massif/ms_main.c trunk/memcheck/Makefile.am trunk/memcheck/mac_leakcheck.c trunk/memcheck/mc_main.c trunk/memcheck/tests/Makefile.am trunk/memcheck/tests/execve2.c trunk/memcheck/tests/filter_xml trunk/memcheck/tests/vgtest_ume.c trunk/memcheck/tests/x86/scalar.stderr.exp trunk/none/Makefile.am trunk/none/nl_main.c trunk/none/tests/Makefile.am trunk/none/tests/as_mmap.stderr.exp trunk/none/tests/as_shm.stderr.exp trunk/none/tests/map_unmap.c trunk/tests/filter_stderr_basic trunk/tests/vg_regtest.in [... diff too large to include ...] |
|
From: Nicholas N. <nj...@cs...> - 2005-09-27 19:50:48
|
On Tue, 27 Sep 2005, sv...@va... wrote: > - build system: I had to import by hand Makefile.core-AM_CPPFLAGS.am > and include it in a couple of places. Building etc seems to still > work, but I haven't tried building the documentation. Where did you have to do this? I can't see it. > - Regtests: although this appears to work, no .out files appear, which > is strange, and makes it hard to diagnose regtest failures. In > particular memcheck/tests/x86/scalar.stderr.exp remains in a > conflicted state. I've removed the conflict in a way that seems reasonable and works on my machine. The .out files appear fine -- were you mixing up .stdout.out and .stderr.out files? Nick |
|
From: Julian S. <js...@ac...> - 2005-09-27 21:01:11
|
On Tuesday 27 September 2005 20:50, Nicholas Nethercote wrote: > On Tue, 27 Sep 2005, sv...@va... wrote: > > - build system: I had to import by hand Makefile.core-AM_CPPFLAGS.am > > and include it in a couple of places. Building etc seems to still > > work, but I haven't tried building the documentation. > > Where did you have to do this? I can't see it. I misphrased that. What I meant is that on line 2 of coregrind/Makefile.am, svn merge produced include $(top_srcdir)/Makefile.core.am and I to change that to include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am in line with what the ASPACEM branch said. Also had to do that in one other place which I can't remember now. > > - Regtests: although this appears to work, no .out files appear, which > > is strange, and makes it hard to diagnose regtest failures. In > > particular memcheck/tests/x86/scalar.stderr.exp remains in a > > conflicted state. > > I've removed the conflict in a way that seems reasonable and works on my > machine. The .out files appear fine -- were you mixing up .stdout.out and > .stderr.out files? sewardj@phoenix:~/VgTRUNK/trunk$ make regtest [...] == 187 tests, 4 stderr failures, 2 stdout failures ================= memcheck/tests/vgtest_ume (stderr) memcheck/tests/x86/scalar (stderr) none/tests/cmdline1 (stdout) none/tests/cmdline2 (stdout) none/tests/faultstatus (stderr) none/tests/x86/int (stderr) make: *** [regtest] Error 1 sewardj@phoenix:~/VgTRUNK/trunk$ find . -name "*.out" ./none/tests/x86/int.stderr.out ./none/tests/cmdline1.stdout.out ./none/tests/cmdline2.stdout.out ./none/tests/faultstatus.stderr.out ./memcheck/tests/x86/scalar.stderr.out ./memcheck/tests/vgtest_ume.stderr.out I expected each test that was run would have contributed at least one .out file. It's as if the regtest system deleted them for the tests which passed. Perhaps it always did that and I should get another coffee. J |
|
From: Nicholas N. <nj...@cs...> - 2005-09-28 02:58:43
|
On Tue, 27 Sep 2005, Julian Seward wrote: > I misphrased that. What I meant is that on line 2 of > coregrind/Makefile.am, svn merge produced > > include $(top_srcdir)/Makefile.core.am > > and I to change that to > > include $(top_srcdir)/Makefile.core-AM_CPPFLAGS.am > > in line with what the ASPACEM branch said. Also had to do that in > one other place which I can't remember now. Ah. I believe Makefile.core-AM_CPPFLAGS.am got renamed as Makefile.core.am in the trunk while ASPACEM was being worked on. I've fixed it up. Nick |