Merge remote-tracking branch 'remotes/origin/dyn_pc_integration' into pc_bluegene
authorlegendre1 <legendre1@auk60.llnl.gov>
Tue, 17 May 2011 00:18:45 +0000 (17:18 -0700)
committerlegendre1 <legendre1@auk60.llnl.gov>
Tue, 17 May 2011 00:18:45 +0000 (17:18 -0700)
commit921ebdf034c174fbea86a28dd7bd4553addbb047
treecec938042ef0d88a51e336c29947982e6b6cffe0
parent0793f5f32b207625ff740a7d17e0c854e23d0171
parent88da9a78f17f89e51c47c35a07a49d3f341c9d58
Merge remote-tracking branch 'remotes/origin/dyn_pc_integration' into pc_bluegene

Conflicts:
dyninstAPI/src/pcEventHandler.C
testsuite/Makefile
testsuite/amd64-unknown-freebsd7.2/tuples
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/tuples
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/make.solo_mutatee.gen
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/dyninst_cxx_group_test_group.c
testsuite/sparc-sun-solaris2.8/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.8/symtab_group_test_group.c
testsuite/sparc-sun-solaris2.8/test_info_new.gen.C
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/Makefile
testsuite/sparc-sun-solaris2.9/dyninst_cxx_group_test_group.c
testsuite/sparc-sun-solaris2.9/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.9/symtab_group_test_group.c
testsuite/sparc-sun-solaris2.9/test_info_new.gen.C
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/dyninst/test2_3.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/symtab/test_type_info.C
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/tuples
46 files changed:
Makefile
common/h/Types.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/pcEventHandler.C
dynutil/h/dyn_regs.h
make.config
proccontrol/amd64-unknown-freebsd7.2/Makefile
proccontrol/src/sysv.C
symtabAPI/src/Symtab.C
testsuite/Makefile
testsuite/amd64-unknown-freebsd7.2/tuples
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/tuples
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/make.solo_mutatee.gen
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/src/TestData.h
testsuite/src/dyninst/dyninst_comp.C
testsuite/src/dyninst/test1_41.C
testsuite/src/dyninst/test2_3.C
testsuite/src/dyninst/test2_4.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/proccontrol/pc_breakpoint.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/symtab/test_line_info.C
testsuite/src/symtab/test_lookup_func.C
testsuite/src/symtab/test_type_info.C
testsuite/src/test_lib.C
testsuite/src/test_lib.h
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/tuples
testsuite/x86_64_cnl/make.solo_mutatee.gen
testsuite/x86_64_cnl/tuples