diff options
| author | Korey Sewell <ksewell@umich.edu> | 2009-07-31 10:40:42 -0400 |
|---|---|---|
| committer | Korey Sewell <ksewell@umich.edu> | 2009-07-31 10:40:42 -0400 |
| commit | aa75b9a7a7489bf86c4e6d406ff612e596ddff96 (patch) | |
| tree | 58a6816583a21c19c181e32bff10bf74aa9ad15f /src/base | |
| parent | 60063cc700912666fa8b7968d692d00a1e82cb67 (diff) | |
| parent | 3dd3de5feb31055a48acb39575da25a9cea2626d (diff) | |
| download | gem5-aa75b9a7a7489bf86c4e6d406ff612e596ddff96.tar.xz | |
merge mips fix and statetrace changes
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/loader/elf_object.cc | 4 | ||||
| -rw-r--r-- | src/base/loader/object_file.hh | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc index 16fc698dd..15ad88f76 100644 --- a/src/base/loader/elf_object.cc +++ b/src/base/loader/elf_object.cc @@ -107,7 +107,6 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data) { case ELFOSABI_LINUX: - case ELFOSABI_ARM: opSys = ObjectFile::Linux; break; case ELFOSABI_SOLARIS: @@ -116,6 +115,9 @@ ElfObject::tryFile(const string &fname, int fd, size_t len, uint8_t *data) case ELFOSABI_TRU64: opSys = ObjectFile::Tru64; break; + case ELFOSABI_ARM: + opSys = ObjectFile::LinuxArmOABI; + break; default: opSys = ObjectFile::UnknownOpSys; } diff --git a/src/base/loader/object_file.hh b/src/base/loader/object_file.hh index 73df5caf6..e511451b7 100644 --- a/src/base/loader/object_file.hh +++ b/src/base/loader/object_file.hh @@ -59,7 +59,8 @@ class ObjectFile UnknownOpSys, Tru64, Linux, - Solaris + Solaris, + LinuxArmOABI }; protected: |