Merge branch 'master' of legendre@git.dyninst.org:/pub/dyninst
authorMatthew Legendre <legendre@coriander.cs.wisc.edu>
Mon, 13 Sep 2010 19:09:41 +0000 (14:09 -0500)
committerMatthew Legendre <legendre@coriander.cs.wisc.edu>
Mon, 13 Sep 2010 19:09:41 +0000 (14:09 -0500)
commitaa8eb7f4ce6b4172149bc33eaf5b36a84d19692c
treebadd81a82c06c1633fed566a415e41b66f5cfa2b
parentedf3eba00efe9a67e864566308bec6d6c2982c15
parentb3eded76dcc7e21e829da681da5c366a8067731c
Merge branch 'master' of legendre@git.dyninst.org:/pub/dyninst

Conflicts:
proccontrol/src/handler.C
proccontrol/src/int_process.h
proccontrol/src/process.C
proccontrol/src/sysv.C
testsuite/Makefile
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/test_info_new.gen.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/make.module.tmpl
testsuite/ppc32_linux/test_info_new.gen.C
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/test_info_new.gen.C
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/test_info_new.gen.C
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/test_info_new.gen.C
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/test_info_new.gen.C
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/StdOutputDriver.C
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/dyninst_comp.h
testsuite/src/dyninst/test1_41.C
testsuite/src/dyninst/test2_11.C
testsuite/src/dyninst/test2_12.C
testsuite/src/dyninst/test2_13.C
testsuite/src/dyninst/test2_14.C
testsuite/src/dyninst/test2_5.C
testsuite/src/dyninst/test2_7.C
testsuite/src/dyninst/test3_1.C
testsuite/src/dyninst/test3_2.C
testsuite/src/dyninst/test3_4.C
testsuite/src/dyninst/test3_5.C
testsuite/src/dyninst/test3_7.C
testsuite/src/dyninst/test4_1.C
testsuite/src/dyninst/test4_2.C
testsuite/src/dyninst/test4_3.C
testsuite/src/dyninst/test4_4.C
testsuite/src/dyninst/test_fork_5.C
testsuite/src/dyninst/test_lib_mutateeStart.C
testsuite/src/dyninst/test_thread_6.C
testsuite/src/dyninst/test_thread_7.C
testsuite/src/dyninst/test_thread_8.C
testsuite/src/proccontrol/pcontrol_mutatee_tools.c
testsuite/src/proccontrol/proccontrol_comp.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/specification/test.pl
testsuite/src/specification/tuples.py
testsuite/src/test_driver.C
testsuite/src/test_info_new.h
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
71 files changed:
common/x86_64_cnl/Makefile
make.config
proccontrol/h/Process.h
proccontrol/src/process.C
testsuite/Makefile
testsuite/amd64-unknown-freebsd7.2/dyninst_cxx_group_test_group.c
testsuite/amd64-unknown-freebsd7.2/symtab_group_test_group.c
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/dyninst_cxx_group_test_group.c
testsuite/i386-unknown-freebsd7.2/symtab_group_test_group.c
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/test_info_new.gen.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/make.module.tmpl
testsuite/ppc32_linux/test_info_new.gen.C
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/test_info_new.gen.C
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/test_info_new.gen.C
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/test_info_new.gen.C
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/test_info_new.gen.C
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/CmdLine.C
testsuite/src/StdOutputDriver.C
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/dyninst_comp.h
testsuite/src/dyninst/test1_40.C
testsuite/src/dyninst/test1_41.C
testsuite/src/dyninst/test2_1.C
testsuite/src/dyninst/test2_13.C
testsuite/src/dyninst/test2_14.C
testsuite/src/dyninst/test2_2.C
testsuite/src/dyninst/test2_3.C
testsuite/src/dyninst/test2_4.C
testsuite/src/dyninst/test2_8.C
testsuite/src/dyninst/test3_1.C
testsuite/src/dyninst/test3_2.C
testsuite/src/dyninst/test3_3.C
testsuite/src/dyninst/test3_4.C
testsuite/src/dyninst/test3_5.C
testsuite/src/dyninst/test3_6.C
testsuite/src/dyninst/test3_7.C
testsuite/src/dyninst/test4_1.C
testsuite/src/dyninst/test4_2.C
testsuite/src/dyninst/test4_3.C
testsuite/src/dyninst/test4_4.C
testsuite/src/dyninst/test_fork_5.C
testsuite/src/dyninst/test_lib_mutateeStart.C
testsuite/src/mutatee_util.h
testsuite/src/proccontrol/pcontrol_mutatee_tools.c
testsuite/src/proccontrol/proccontrol_comp.C
testsuite/src/proccontrol/proccontrol_comp.h
testsuite/src/runTests-utils.h
testsuite/src/specification/makemake.py
testsuite/src/specification/spec-grouped.pl
testsuite/src/specification/test.pl
testsuite/src/specification/tuples.py
testsuite/src/symtab/test_add_symbols.C
testsuite/src/test_info_new.C
testsuite/src/test_info_new.h
testsuite/src/test_lib.C
testsuite/src/test_lib_soExecution.C
testsuite/x86_64-unknown-linux2.4/Makefile
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples