diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-05-14 23:58:23 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-05-14 23:58:23 -0400 |
| commit | 0a053c7919cb13d216d85784577cbbd4539cd291 (patch) | |
| tree | 785eb25f80e0523531bb6db2558435e3105c427d /base/loader | |
| parent | 0be3d001c9089b78e334dca6d0c7f1a178cf202f (diff) | |
| parent | 149b724b86ae6cc40d8794123e8359209080f5a9 (diff) | |
| download | gem5-0a053c7919cb13d216d85784577cbbd4539cd291.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 2db5529a9fbe8c62e57cad05f093c915f9713c67
Diffstat (limited to 'base/loader')
| -rw-r--r-- | base/loader/elf_object.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/loader/elf_object.cc b/base/loader/elf_object.cc index a104719af..9f30a1bbe 100644 --- a/base/loader/elf_object.cc +++ b/base/loader/elf_object.cc @@ -82,7 +82,8 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data) //what it must be. if (ehdr.e_machine == EM_SPARC64 || ehdr.e_machine == EM_SPARC || - ehdr.e_machine == EM_SPARCV9) { + ehdr.e_machine == EM_SPARCV9 || + ehdr.e_machine == EM_SPARC32PLUS) { arch = ObjectFile::SPARC; } else if (ehdr.e_machine == EM_MIPS && ehdr.e_ident[EI_CLASS] == ELFCLASS32) { |