From: Ali Saidi <saidi@eecs.umich.edu>
Date: Fri, 26 Jan 2007 23:49:40 +0000 (-0500)
Subject: Merge zeep.pool:/z/saidi/work/m5.newmem
X-Git-Tag: m5_2.0_beta3~238^2~7^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f;p=gem5.git

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

--HG--
extra : convert_revision : 20f61a524a3b53fc0afcf53a24b5a1fe1d96f579
---

fd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f
diff --cc src/arch/sparc/isa/includes.isa
index 0c112d481,688f26d5c..5d90fbdd2
--- a/src/arch/sparc/isa/includes.isa
+++ b/src/arch/sparc/isa/includes.isa
@@@ -63,8 -64,8 +64,9 @@@ output exec {
  #if defined(linux)
  #include <fenv.h>
  #endif
 +#include <limits>
  
+ #include <cmath>
  #include "arch/sparc/asi.hh"
  #include "cpu/base.hh"
  #include "cpu/exetrace.hh"
diff --cc src/base/loader/object_file.cc
index da5aa9552,2273b6c4e..7424b9305
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@@ -147,12 -147,6 +147,12 @@@ createObjectFile(const string &fname, b
  
      // don't know what it is
      close(fd);
-     munmap(fileData, len);
+     munmap((char*)fileData, len);
      return NULL;
  }
 +
 +bool
 +ObjectFile::isDynamic()
 +{
 +    return false;
 +}