Merge branch 'master' into bsd
authorDaniel McNulty <mcnulty@cs.wisc.edu>
Mon, 7 Jun 2010 15:11:23 +0000 (10:11 -0500)
committerDaniel McNulty <mcnulty@cs.wisc.edu>
Mon, 7 Jun 2010 15:11:23 +0000 (10:11 -0500)
commite3f041fb7c798d378cd4023c5038a676a4669c2a
tree0b6e36f2b3946186394fd236924a0bb9ab198b93
parent3161614b6aad9bcfcff3e4354e03aa0c032c7d9b
parentf7555c7beaf304731138cb1c1f4fe323920fc892
Merge branch 'master' into bsd

Conflicts:
common/src/addrtranslate-sysv.h
proccontrol/src/sysv.C
symtabAPI/src/emitElf.C
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/ia64-unknown-linux2.4/tuples
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/dyninst/test1.h
testsuite/x86_64-unknown-linux2.4/tuples
36 files changed:
dyninstAPI/src/arch-x86.C
dyninstAPI/src/image-flowGraph.C
dyninstAPI/src/inst-x86.C
make.config
proccontrol/src/linux.C
proccontrol/src/sysv.C
symtabAPI/src/Object-elf.C
symtabAPI/src/Symtab.C
symtabAPI/src/emitElf-64.C
symtabAPI/src/emitElf.C
testsuite/amd64-unknown-freebsd7.2/make.mutators.gen
testsuite/amd64-unknown-freebsd7.2/tuples
testsuite/i386-unknown-freebsd7.2/make.mutators.gen
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-freebsd8.0/make.mutators.gen
testsuite/i386-unknown-freebsd8.0/make.solo_mutatee.gen
testsuite/i386-unknown-freebsd8.0/test_info_new.gen.C
testsuite/i386-unknown-freebsd8.0/tuples
testsuite/i386-unknown-linux2.4/tuples
testsuite/i386-unknown-nt4.0/tuples
testsuite/ia64-unknown-linux2.4/tuples
testsuite/make.module.tmpl
testsuite/ppc32_linux/tuples
testsuite/ppc64_linux/tuples
testsuite/rs6000-ibm-aix5.1/tuples
testsuite/sparc-sun-solaris2.8/tuples
testsuite/sparc-sun-solaris2.9/tuples
testsuite/src/dyninst/ParseThat.C
testsuite/src/dyninst/test1.h
testsuite/src/dyninst/test_lib_mutateeStart.C
testsuite/src/runTests-utils.h
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_driver.C
testsuite/x86_64-unknown-linux2.4/tuples