diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | src/gpuwattch/mcpat.mk | 18 |
2 files changed, 16 insertions, 4 deletions
@@ -71,6 +71,8 @@ Version 3.2.0+edits (development branch) versus 3.2.0 treat zero as false and non-zero as true). - Fix for bug 47 - Issue with generating PTXPLUS with global __device__ variables: Expecting ".nv.global", provided ".nv.global.init". + - Fixing GPUWattch McPAT Makefile to use -m32 for 32 bit and -m64 + for 64 bit Linux. Version 3.2.0 versus 3.1.2 - Added GPUWattch GPGPU power model based on McPAT 0.8beta. diff --git a/src/gpuwattch/mcpat.mk b/src/gpuwattch/mcpat.mk index 22511e5..1a9405d 100644 --- a/src/gpuwattch/mcpat.mk +++ b/src/gpuwattch/mcpat.mk @@ -11,6 +11,17 @@ endif LIBS = INCS = -lm +CC= +CXX= + +ifeq ($(shell getconf LONG_BIT),64) + CXX = g++ -m64 + CC = gcc -m64 +else + CXX = g++ -m32 + CC = gcc -m32 +endif + ifeq ($(TAG),dbg) DBG = -Wall OPT = -ggdb -fPIC -g -O0 -DNTHREADS=1 -Icacti -lz @@ -22,10 +33,9 @@ endif #CXXFLAGS = -Wall -Wno-unknown-pragmas -Winline $(DBG) $(OPT) CXXFLAGS = -Wno-unknown-pragmas $(DBG) $(OPT) -#CXX = g++ -m32 -CXX = g++ -m64 -#CC = gcc -m32 -CC = gcc -m64 + + + VPATH = cacti |