summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-11-08 15:06:17 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-11-08 15:06:17 -0500
commit7c3d933cd62b2293e3e09647a95c0d69075d67ec (patch)
treeb98ab0fddb6754ccdd4945f6ea42df7e867d7a26 /src
parent344f72dd62f6cc9ab8c7ab5454a320b2e5674a37 (diff)
parent100f9bfb0b87cfd393226efe714eb9259b978aff (diff)
downloadgem5-7c3d933cd62b2293e3e09647a95c0d69075d67ec.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : 643e28482e6739bd264a9c2d69c17279853aa0c5
Diffstat (limited to 'src')
-rw-r--r--src/SConscript9
-rw-r--r--src/base/statistics.hh4
2 files changed, 10 insertions, 3 deletions
diff --git a/src/SConscript b/src/SConscript
index d938d533f..8d2c8566b 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -399,8 +399,15 @@ def makeEnv(label, objsfx, strip = False, **kwargs):
envList.append(newEnv)
# Debug binary
+# Solaris seems to have some issue with DWARF2 debugging information, it's ok
+# with stabs though
+if sys.platform == 'sunos5':
+ debug_flag = '-gstabs+'
+else:
+ debug_flag = '-ggdb3'
+
makeEnv('debug', '.do',
- CCFLAGS = Split('-g3 -gdwarf-2 -O0'),
+ CCFLAGS = Split('%s -O0' % debug_flag),
CPPDEFINES = 'DEBUG')
# Optimized binary
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 59f219c07..577ea5eab 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -696,7 +696,7 @@ class ScalarBase : public DataAccess
protected:
/** The storage of this stat. */
- char storage[sizeof(Storage)];
+ char storage[sizeof(Storage)] __attribute__ ((aligned (8)));
/** The parameters for this stat. */
Params params;
@@ -1637,7 +1637,7 @@ class DistBase : public DataAccess
protected:
/** The storage for this stat. */
- char storage[sizeof(Storage)];
+ char storage[sizeof(Storage)] __attribute__ ((aligned (8)));
/** The parameters for this stat. */
Params params;