Merge branch 'pc_bgq' into dyninst_proccontrol
authorMatthew P. Legendre <legendre@cab667.llnl.gov>
Fri, 6 Jul 2012 21:22:04 +0000 (14:22 -0700)
committerMatthew P. Legendre <legendre@cab667.llnl.gov>
Fri, 6 Jul 2012 21:22:04 +0000 (14:22 -0700)
commita07e177b8a4ef4bd7a02cac2d2a46c23bade7411
tree81b6daaa9d576afdaedec626de7ce394a502e67a
parentc603e0e351e8bc8665b72db57c1c2c7c640a56c1
parent5dbd5027c38157151661ece5c2a244e85db98e8a
Merge branch 'pc_bgq' into dyninst_proccontrol

Conflicts:
instructionAPI/make.module.tmpl
make.components
parseAPI/make.module.tmpl
proccontrol/src/linux.h
proccontrol/src/process.C
stackwalk/src/sw.h
stackwalk/src/sw_pcontrol.C
stackwalk/src/walker.C
testsuite-merge/x86_64_cnl/make.mutators.gen
testsuite-merge/x86_64_cnl/test_info_new.gen.C
testsuite-merge/x86_64_cnl/tuples
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd7.2/tuples
testsuite/i386-unknown-linux2.4/make.solo_mutatee.gen
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/tuples
testsuite/ppc32_bgp_ion/make.solo_mutatee.gen
testsuite/ppc32_bgp_ion/tuples
testsuite/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/tuples
testsuite/ppc64_bgq_ion/Makefile
testsuite/ppc64_bgq_ion/make.solo_mutatee.gen
testsuite/ppc64_bgq_ion/tuples
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/tuples
testsuite/src/proccontrol/pc_groups_mutatee.c
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/tuples
56 files changed:
common/ppc64_bgq_ion/Makefile
dyninstAPI/ppc64_bgq/Makefile
dyninstAPI_RT/ppc64_bgq/Makefile
instructionAPI/make.module.tmpl
make.config
parseAPI/make.module.tmpl
proccontrol/h/PCProcess.h
proccontrol/h/ProcessSet.h
proccontrol/make.module.tmpl
proccontrol/src/event.C
proccontrol/src/handler.C
proccontrol/src/int_process.h
proccontrol/src/linux.C
proccontrol/src/linux.h
proccontrol/src/process.C
proccontrol/src/procset.C
proccontrol/src/response.h
stackwalk/h/walker.h
stackwalk/src/framestepper.C
stackwalk/src/linuxbsd-swk.C
stackwalk/src/sw.h
stackwalk/src/sw_pcontrol.C
stackwalk/src/walker.C
symtabAPI/src/Object.h
testsuite-merge/i386-unknown-nt4.0/Makefile
testsuite/amd64-unknown-freebsd7.2/make.solo_mutatee.gen
testsuite/amd64-unknown-freebsd7.2/test_info_new.gen.C
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.solo_mutatee.gen
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/nmake.solo_mutatee.gen
testsuite/i386-unknown-nt4.0/test_info_new.gen.C
testsuite/i386-unknown-nt4.0/tuples
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/tuples
testsuite/ppc32_bgp_ion/make.solo_mutatee.gen
testsuite/ppc32_bgp_ion/tuples
testsuite/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/test_info_new.gen.C
testsuite/ppc32_linux/tuples
testsuite/ppc64_bgq_ion/make.solo_mutatee.gen
testsuite/ppc64_bgq_ion/tuples
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/test_info_new.gen.C
testsuite/ppc64_linux/tuples
testsuite/src/proccontrol/pc_groups_mutatee.c
testsuite/src/proccontrol/pcontrol_mutatee_tools.c
testsuite/src/proccontrol/proccontrol_comp.h
testsuite/src/specification/spec-grouped.pl
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