Merge commit 'origin/dyn_pc_integration' into origin/pc_bluegene
authorMatthew P. Legendre <legendre@atlas608.llnl.gov>
Thu, 3 Mar 2011 17:52:43 +0000 (09:52 -0800)
committerMatthew P. Legendre <legendre@atlas608.llnl.gov>
Thu, 3 Mar 2011 17:52:43 +0000 (09:52 -0800)
commit7098307f5a9472d111f10fbc6cb67e158914b230
treef8484daafdfef299a1ec1a1627df48036e6fc3e8
parent3e0c3c5ff07bee355c4d7d4fedb9c8e7eb536053
parentdc9f04519b065c29c208d59453892708deee3a5e
Merge commit 'origin/dyn_pc_integration' into origin/pc_bluegene

Conflicts:

Makefile
proccontrol/h/Process.h
proccontrol/src/event.C
proccontrol/src/linux.h
proccontrol/src/ppc_process.C
proccontrol/src/process.C
proccontrol/src/unix.C
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/make.module.tmpl
testsuite/ppc32_bgp/make.mutators.gen
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/tuples
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/dyninst/test_thread_6.C
testsuite/src/mutatee_driver.c
testsuite/src/proccontrol/pcontrol_mutatee_tools.c
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_driver.C
testsuite/src/test_lib.C
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
89 files changed:
common/src/addrtranslate-sysv.C
dyninstAPI/src/pcEventHandler.C
proccontrol/h/Event.h
proccontrol/h/EventType.h
proccontrol/h/Generator.h
proccontrol/h/Process.h
proccontrol/make.module.tmpl
proccontrol/src/event.C
proccontrol/src/freebsd.C
proccontrol/src/freebsd.h
proccontrol/src/generator.C
proccontrol/src/handler.C
proccontrol/src/int_handler.h
proccontrol/src/int_process.h
proccontrol/src/int_thread_db.C
proccontrol/src/int_thread_db.h
proccontrol/src/irpc.C
proccontrol/src/linux.C
proccontrol/src/linux.h
proccontrol/src/ppc_process.C
proccontrol/src/ppc_process.h
proccontrol/src/process.C
proccontrol/src/sysv.C
proccontrol/src/sysv.h
proccontrol/src/unix.C
proccontrol/src/x86_process.C
proccontrol/src/x86_process.h
proccontrol/x86_64-unknown-linux2.4/Makefile
stackwalk/make.module.tmpl
stackwalk/src/bluegene-swk.C
stackwalk/src/dbginfo-stepper.C
stackwalk/src/sw_pcontrol.C
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/test_info_new.gen.C
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/test_info_new.gen.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/make.module.tmpl
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/test_info_new.gen.C
testsuite/ppc32_bgp/tuples
testsuite/ppc32_bgp_ion/test_info_new.gen.C
testsuite/ppc32_bgp_ion/tuples
testsuite/ppc32_linux/make.mutators.gen
testsuite/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/test_info_new.gen.C
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/make.mutators.gen
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/test_info_new.gen.C
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/make.solo_mutatee.gen
testsuite/rs6000-ibm-aix5.1/test_info_new.gen.C
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.8/test_info_new.gen.C
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.9/test_info_new.gen.C
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/DatabaseOutputDriver.C
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/test3_7.C
testsuite/src/dyninst/test_pt_ls.C
testsuite/src/dyninst/test_thread_6.C
testsuite/src/dyninst/test_thread_8.C
testsuite/src/dyninst/test_thread_8_mutatee.c
testsuite/src/dynlmon.C
testsuite/src/proccontrol/pc_breakpoint_mutatee.c
testsuite/src/proccontrol/pc_thread.C
testsuite/src/proccontrol/pc_thread_cont.C
testsuite/src/proccontrol/pc_thread_mutatee.c
testsuite/src/proccontrol/pcontrol_mutatee_tools.c
testsuite/src/proccontrol/pcontrol_mutatee_tools.h
testsuite/src/proccontrol/proccontrol_comp.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/specification/test.pl
testsuite/src/test_driver.C
testsuite/src/test_lib.C
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/test_info_new.gen.C
testsuite/x86_64-unknown-linux2.4/tuples
testsuite/x86_64_cnl/make.mutators.gen
testsuite/x86_64_cnl/make.solo_mutatee.gen
testsuite/x86_64_cnl/test_info_new.gen.C
testsuite/x86_64_cnl/tuples