diff options
| author | Tor Aamodt <[email protected]> | 2012-07-27 21:56:35 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:48:53 -0700 |
| commit | 13d2ba3af71a4110dbe24772555cdc3d341425a8 (patch) | |
| tree | 6c8412bc8971d17f4028b7c0168dd453d6f071f0 /src | |
| parent | 72633ca8a03300577cb2c175cddd9e7e88c0704f (diff) | |
- can compile on MacOSX (tested on Lion)... no regression testing done on Mac
- ptxplus ... edits to eliminate some warnings with older gcc about printfs without string literal
- eliminate warning about map (just too annoying while testing on Mac)
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13560]
Diffstat (limited to 'src')
| -rw-r--r-- | src/cuda-sim/cuda-math.h | 14 | ||||
| -rw-r--r-- | src/tr1_hash_map.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/cuda-sim/cuda-math.h b/src/cuda-sim/cuda-math.h index b4502a1..4721e8a 100644 --- a/src/cuda-sim/cuda-math.h +++ b/src/cuda-sim/cuda-math.h @@ -336,11 +336,6 @@ float __powf(float a, float b) // math functions missing in Mac OSX GCC #ifdef __APPLE__ -int isnanf(float a) -{ - return (isnan(a)); -} - int __signbitd(double d) { unsigned long long int u = *((unsigned long long int*)&d); @@ -353,8 +348,17 @@ int __signbitd(double d) #include <math_functions.h> #undef __CUDA_INTERNAL_COMPILATION__ #undef __attribute__ + #endif } +// math functions missing in Mac OSX GCC +#ifdef __APPLE__ +int isnanf(float a) +{ + return (isnan(a)); +} +#endif + #endif diff --git a/src/tr1_hash_map.h b/src/tr1_hash_map.h index a2d3334..8c7513e 100644 --- a/src/tr1_hash_map.h +++ b/src/tr1_hash_map.h @@ -47,8 +47,4 @@ #define tr1_hash_map_ismap 1 #endif - #if tr1_hash_map_ismap == 1 - #warning "Pre-C++11 GCC version detected. Downgrading all use of <unordered_map> to <map>. Please upgrade to GCC 4.3 or later for faster simulation." - #endif - #endif |