summaryrefslogtreecommitdiff
path: root/base/intmath.hh
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2004-06-23 18:39:11 -0400
committerAli Saidi <saidi@eecs.umich.edu>2004-06-23 18:39:11 -0400
commit4799a7b87439913765029117eb51fcacd6f07edb (patch)
treecfbe3c0f5aee6003a484ad693be4f885ab731dd9 /base/intmath.hh
parent17bfb1540e938406548202f3f1c941857f514c33 (diff)
downloadgem5-4799a7b87439913765029117eb51fcacd6f07edb.tar.xz
minor changes to endian code so that it runs on x86 linux
base/intmath.hh: only need FloorLog2(size_t) on a mac, so ifdefed for this dev/alpha_console.cc: Actually allocate the alphaAccess struct. --HG-- extra : convert_revision : 1f50b1a025c8ee728a9f3d2c603ea38347234f54
Diffstat (limited to 'base/intmath.hh')
-rw-r--r--base/intmath.hh4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/intmath.hh b/base/intmath.hh
index fc28eecef..821514668 100644
--- a/base/intmath.hh
+++ b/base/intmath.hh
@@ -119,7 +119,8 @@ FloorLog2(int64_t x)
return FloorLog2((uint64_t)x);
}
-inline int
+#if defined(__APPLE__)
+int
FloorLog2(size_t x)
{
assert(x > 0);
@@ -132,6 +133,7 @@ FloorLog2(size_t x)
return FloorLog2((uint64_t)x);
}
+#endif
template <class T>
inline int