Merge zizzer:/bk/newmem

into  zeep.pool:/z/saidi/work/m5.newmem

base/loader/elf_object.cc:
    removed SPARC32PLUS since it doesn't work.

--HG--
extra : convert_revision : 620a1c75cdeefbeeb97383d92335cf319d9c9444

diff --cc base/loader/elf_object.cc
index 9f30a1bbe93d893e800d985e24c5d697a4addd3f,3f6131088d96767764744828a9800527c0395e2a..165501e1c1a9198e27a0b42996b361315ea74324
--- 1/base/loader/elf_object.cc
--- 2/base/loader/elf_object.cc
+++ b/base/loader/elf_object.cc
@@@ -82,8 -82,8 +82,7 @@@ ElfObject::tryFile(const string &fname
          //what it must be.
          if (ehdr.e_machine == EM_SPARC64 ||
                  ehdr.e_machine == EM_SPARC ||
--                ehdr.e_machine == EM_SPARCV9 ||
--                ehdr.e_machine == EM_SPARC32PLUS) {
++                ehdr.e_machine == EM_SPARCV9) {
              arch = ObjectFile::SPARC;
          } else if (ehdr.e_machine == EM_MIPS
                  && ehdr.e_ident[EI_CLASS] == ELFCLASS32) {