changeset 9345de6fca33 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=9345de6fca33
description:
        ARM: Detect OABI binaries and complain that they're no-longer supported.

diffstat:

3 files changed, 8 insertions(+), 3 deletions(-)
src/base/loader/elf_object.cc  |    4 +++-
src/base/loader/object_file.hh |    3 ++-
src/sim/process.cc             |    4 +++-

diffs (48 lines):

diff -r af82c0870667 -r 9345de6fca33 src/base/loader/elf_object.cc
--- a/src/base/loader/elf_object.cc     Sun Jul 26 00:13:35 2009 -0400
+++ b/src/base/loader/elf_object.cc     Mon Jul 27 00:50:55 2009 -0700
@@ -107,7 +107,6 @@
         {
 
           case ELFOSABI_LINUX:
-          case ELFOSABI_ARM:
             opSys = ObjectFile::Linux;
             break;
           case ELFOSABI_SOLARIS:
@@ -116,6 +115,9 @@
           case ELFOSABI_TRU64:
             opSys = ObjectFile::Tru64;
             break;
+          case ELFOSABI_ARM:
+            opSys = ObjectFile::LinuxArmOABI;
+            break;
           default:
             opSys = ObjectFile::UnknownOpSys;
         }
diff -r af82c0870667 -r 9345de6fca33 src/base/loader/object_file.hh
--- a/src/base/loader/object_file.hh    Sun Jul 26 00:13:35 2009 -0400
+++ b/src/base/loader/object_file.hh    Mon Jul 27 00:50:55 2009 -0700
@@ -59,7 +59,8 @@
         UnknownOpSys,
         Tru64,
         Linux,
-        Solaris
+        Solaris,
+        LinuxArmOABI
     };
 
   protected:
diff -r af82c0870667 -r 9345de6fca33 src/sim/process.cc
--- a/src/sim/process.cc        Sun Jul 26 00:13:35 2009 -0400
+++ b/src/sim/process.cc        Mon Jul 27 00:50:55 2009 -0700
@@ -748,7 +748,9 @@
       case ObjectFile::Linux:
         process = new ArmLinuxProcess(params, objFile);
         break;
-
+      case ObjectFile::LinuxArmOABI:
+        fatal("M5 does not support ARM OABI binaries. Please recompile with an"
+              " EABI compiler.");
       default:
         fatal("Unknown/unsupported operating system.");
     }
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev

Reply via email to