From 49d9395b32cae5d5a15b932f841a0888a98d4d31 Mon Sep 17 00:00:00 2001
From: Tayler Hetherington <tayler.hetherington@gmail.com>
Date: Wed, 3 Apr 2013 11:17:41 -0800
Subject: Fix incorrect initialization of wire_length variable in cacti/wire.cc
 - causing incorrect per-access cache energy Adding 32bit/64bit check to
 Cacti's Makefile.

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 15668]
---
 src/gpuwattch/cacti/cacti.mk | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/gpuwattch/cacti/cacti.mk')

diff --git a/src/gpuwattch/cacti/cacti.mk b/src/gpuwattch/cacti/cacti.mk
index ca921a5..506f3af 100644
--- a/src/gpuwattch/cacti/cacti.mk
+++ b/src/gpuwattch/cacti/cacti.mk
@@ -21,8 +21,15 @@ endif
 
 #CXXFLAGS = -Wall -Wno-unknown-pragmas -Winline $(DBG) $(OPT) 
 CXXFLAGS = -Wno-unknown-pragmas $(DBG) $(OPT) 
-CXX = g++ -m32
-CC  = gcc -m32
+
+ifeq ($(shell getconf LONG_BIT),64) 
+	CXX = g++ -m64
+	CC  = gcc -m64
+else 
+	CXX = g++ -m32
+	CC  = gcc -m32
+endif 
+
 
 SRCS  = area.cc bank.cc mat.cc main.cc Ucache.cc io.cc technology.cc basic_circuit.cc parameter.cc \
 		decoder.cc component.cc uca.cc subarray.cc wire.cc htree2.cc \
@@ -54,4 +61,4 @@ obj_$(TAG)/%.o : %.cc
 clean:
 	-rm -f *.o _cacti.so cacti.py $(TARGET)
 
-include ../Makefile.makedepend
+#include ../Makefile.makedepend
-- 
cgit v1.3