Merge branch 'pcint' into dyn_pc_integration
authorDaniel McNulty <mcnulty@cs.wisc.edu>
Wed, 26 Jan 2011 21:21:42 +0000 (15:21 -0600)
committerDaniel McNulty <mcnulty@cs.wisc.edu>
Wed, 26 Jan 2011 21:21:42 +0000 (15:21 -0600)
commitfd7c1f79a6dfe0138e8d554909399bb55b118ca6
treed3b2ab07d46839eae41f11947e6b6b40a7681f95
parent7eba5cbc0622d1a2f406387ed62f3ba570bb60fe
parent170a09b60a00766f1c9f873c390b1147628e72c5
Merge branch 'pcint' into dyn_pc_integration

Conflicts:
dynC_API/make.module.tmpl
dyninstAPI/src/linux-x86.C
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/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/make.solo_mutatee.gen
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.9/tuples
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/tuples
30 files changed:
dyninstAPI/src/ast.C
stackwalk/src/bluegene-swk.C
stackwalk/src/libstate.C
stackwalk/src/libstate.h
stackwalk/src/symlookup.C
stackwalk/src/walker.C
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/ppc32_bgp/dyninst_group_test_group.c
testsuite/ppc32_bgp/make.mutators.gen
testsuite/ppc32_bgp/make.solo_mutatee.gen
testsuite/ppc32_bgp/tuples
testsuite/ppc32_linux/make.solo_mutatee.gen
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/make.solo_mutatee.gen
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/make.solo_mutatee.gen
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/make.solo_mutatee.gen
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_driver.C
testsuite/x86_64-unknown-linux2.4/make.solo_mutatee.gen
testsuite/x86_64-unknown-linux2.4/tuples