Merge branch 'master' into bsd
authorDaniel McNulty <mcnulty@cs.wisc.edu>
Mon, 17 May 2010 15:15:53 +0000 (10:15 -0500)
committerDaniel McNulty <mcnulty@cs.wisc.edu>
Mon, 17 May 2010 15:15:53 +0000 (10:15 -0500)
commit58a67da616d90cf205e3ae473a1ace8b74a609cc
treeb5d5a7a36ac8f53854fdb00d3ee718bd2dfcb300
parent070b0e7b788b02cc1ec9e34891aafe34554748b0
parent6639ddf64846180bf6c13c771411306c13c0bef2
Merge branch 'master' into bsd

Conflicts:
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/x86_64-unknown-linux2.4/tuples
26 files changed:
dyninstAPI/src/arch-x86.h
dyninstAPI/src/arch.h
dyninstAPI/src/unix.C
make.config
parseThat/Makefile.in
symtabAPI/make.module.tmpl
symtabAPI/src/Object-elf.C
symtabAPI/src/Object-elf.h
symtabAPI/src/Object.h
symtabAPI/src/Symtab.C
symtabAPI/src/emitElf.C
symtabAPI/src/parseDwarf.C
testsuite/i386-unknown-freebsd7.2/tuples
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/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/instruction/test_instruction_profile.C
testsuite/src/specification/spec-grouped.pl
testsuite/src/test_driver.C
testsuite/x86_64-unknown-linux2.4/tuples