From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 15 May 2006 21:52:50 +0000 (-0400)
Subject: Merge zizzer:/bk/newmem
X-Git-Tag: m5_2.0_beta1~84
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7d3eb0fe801add2bdbb05b482e7d7d303b6f386d;p=gem5.git

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
---

7d3eb0fe801add2bdbb05b482e7d7d303b6f386d
diff --cc base/loader/elf_object.cc
index 9f30a1bbe,3f6131088..165501e1c
--- a/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) {