diff options
| author | Andrew M. B. Boktor <[email protected]> | 2012-08-08 18:20:42 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:48:53 -0700 |
| commit | c00424bbb3187f4f9a4718d4d7c078c0c8ff9f73 (patch) | |
| tree | bbf26bc74013a32195ff7d656562278dd7c1c97d | |
| parent | c1ca329ef0a2695f700c4bb692ca3ea8b3c01030 (diff) | |
Fixing compile error on my machine
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13703]
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | src/cuda-sim/cuda-sim.cc | 1 | ||||
| -rw-r--r-- | src/cuda-sim/ptx_ir.h | 2 | ||||
| -rw-r--r-- | src/cuda-sim/ptx_parser.cc | 1 | ||||
| -rw-r--r-- | src/cuda-sim/ptx_sim.cc | 1 | ||||
| -rw-r--r-- | src/gpgpu-sim/shader.h | 2 |
6 files changed, 9 insertions, 2 deletions
@@ -1,6 +1,10 @@ CHANGE LOG: Version 3.1.1 versus 3.1.0 +- Bug Fixes: + - Fixed a compile error that happens with newer gcc/g++ versions (4.7.1) + +Version 3.1.1 versus 3.1.0 - Add checks to top level makefile to ensure setup_environment is run and checks to setup_environment to ensure a compatible version of CUDA is installed. - Change Fermi configuration folder name to GTX480. diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc index 02c7dfd..4cad472 100644 --- a/src/cuda-sim/cuda-sim.cc +++ b/src/cuda-sim/cuda-sim.cc @@ -30,6 +30,7 @@ #include "instructions.h" #include "ptx_ir.h" +#include "ptx.tab.h" #include "ptx_sim.h" #include <stdio.h> diff --git a/src/cuda-sim/ptx_ir.h b/src/cuda-sim/ptx_ir.h index 737a610..15c6743 100644 --- a/src/cuda-sim/ptx_ir.h +++ b/src/cuda-sim/ptx_ir.h @@ -38,7 +38,7 @@ #include <vector> #include <assert.h> -#include "ptx.tab.h" +//#include "ptx.tab.h" #include "ptx_sim.h" #include "memory.h" diff --git a/src/cuda-sim/ptx_parser.cc b/src/cuda-sim/ptx_parser.cc index 257da1a..cc97b72 100644 --- a/src/cuda-sim/ptx_parser.cc +++ b/src/cuda-sim/ptx_parser.cc @@ -27,6 +27,7 @@ #include "ptx_parser.h" #include "ptx_ir.h" +#include "ptx.tab.h" #include <stdarg.h> extern "C" int ptx_error( const char *s ); diff --git a/src/cuda-sim/ptx_sim.cc b/src/cuda-sim/ptx_sim.cc index 05f0c6a..b0393fa 100644 --- a/src/cuda-sim/ptx_sim.cc +++ b/src/cuda-sim/ptx_sim.cc @@ -28,6 +28,7 @@ #include "ptx_sim.h" #include <string> #include "ptx_ir.h" +#include "ptx.tab.h" #include "../gpgpu-sim/gpu-sim.h" #include "../gpgpu-sim/shader.h" diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h index d246393..86a1a86 100644 --- a/src/gpgpu-sim/shader.h +++ b/src/gpgpu-sim/shader.h @@ -42,7 +42,7 @@ #include <algorithm> #include <deque> -#include "../cuda-sim/ptx.tab.h" +//#include "../cuda-sim/ptx.tab.h" #include "delayqueue.h" #include "stack.h" |