From c887b0c3578a356bdff3476e03b8fb7a2a1b298a Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Wed, 11 Dec 2013 23:16:56 -0800 Subject: [PATCH] - attempt to cleanup a few warnings - attempt to get git rev info each compile (not just when running cmake) --- CMakeLists.txt | 16 ++++++++++------ .../include/streflop/libm/headers/features.h | 6 ++++++ .../sources/streflop/libm/flt-32/e_gammaf_r.cpp | 2 +- .../sources/streflop/libm/flt-32/e_lgammaf_r.cpp | 1 + 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 549f41ba..229fece9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,6 +191,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) # Get the git revision info for the binary SET(HAS_GIT "FALSE") + SET(GIT_LIVE_REV_CMD "") OPTION(WANT_GIT_STAMP "use git revision stamp" ON) IF(WANT_GIT_STAMP) @@ -218,16 +219,19 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) OUTPUT_STRIP_TRAILING_WHITESPACE ) - MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}]") + SET(GIT_LIVE_REV_CMD "`git log -1 --format=%h`.`git rev-list HEAD --count`") + + MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}] CMD [${GIT_LIVE_REV_CMD}]") ENDIF() ENDIF() -IF(APPLE AND NOT CMAKE_COMPILER_IS_GNUCXX) - SET(GIT_VERSION_CMD "-DGITVERSION='\\\\'${GIT_COMMIT_COUNT}.${GIT_SHA1}\\\\''") -ELSE() - SET(GIT_VERSION_CMD "-DGITVERSION='\\\"${GIT_COMMIT_COUNT}.${GIT_SHA1}\\\"'") -ENDIF() + IF(APPLE AND NOT CMAKE_COMPILER_IS_GNUCXX) + SET(GIT_VERSION_CMD "-DGITVERSION='\\\\'${GIT_LIVE_REV_CMD}\\\\''") + ELSE() + SET(GIT_VERSION_CMD "-DGITVERSION='\\\"${GIT_LIVE_REV_CMD}\\\"'") +# SET(SVN_VERSION_CMD "-DSVNVERSION='\\\"`svnversion -n ${PROJECT_SOURCE_DIR}`\\\"'") + ENDIF() IF(CMAKE_INSTALL_PREFIX STREQUAL "") MESSAGE(STATUS "*NOTE: NOT USING a Custom Data Install Path...") diff --git a/source/shared_lib/include/streflop/libm/headers/features.h b/source/shared_lib/include/streflop/libm/headers/features.h index 9e3292f0..6febc85d 100644 --- a/source/shared_lib/include/streflop/libm/headers/features.h +++ b/source/shared_lib/include/streflop/libm/headers/features.h @@ -287,11 +287,17 @@ #endif /* We do support the IEC 559 math functionality, real and complex. */ +#if !defined(__STDC_IEC_559__) #define __STDC_IEC_559__ 1 +#endif +#if !defined(__STDC_IEC_559_COMPLEX__) #define __STDC_IEC_559_COMPLEX__ 1 +#endif /* wchar_t uses ISO 10646-1 (2nd ed., published 2000-09-15) / Unicode 3.1. */ +#if !defined(__STDC_ISO_10646__) #define __STDC_ISO_10646__ 200009L +#endif /* This macro indicates that the installed library is the GNU C Library. For historic reasons the value now is 6 and this will stay from now diff --git a/source/shared_lib/sources/streflop/libm/flt-32/e_gammaf_r.cpp b/source/shared_lib/sources/streflop/libm/flt-32/e_gammaf_r.cpp index bbb25af8..97450102 100644 --- a/source/shared_lib/sources/streflop/libm/flt-32/e_gammaf_r.cpp +++ b/source/shared_lib/sources/streflop/libm/flt-32/e_gammaf_r.cpp @@ -46,7 +46,7 @@ __ieee754_gammaf_r (Simple x, int *signgamp) *signgamp = 0; return (x - x) / (x - x); } - if (hx == 0xff800000) + if ((u_int32_t)hx == 0xff800000) { /* x == -Inf. According to ISO this is NaN. */ *signgamp = 0; diff --git a/source/shared_lib/sources/streflop/libm/flt-32/e_lgammaf_r.cpp b/source/shared_lib/sources/streflop/libm/flt-32/e_lgammaf_r.cpp index b9f7d3d8..85d0b6f3 100644 --- a/source/shared_lib/sources/streflop/libm/flt-32/e_lgammaf_r.cpp +++ b/source/shared_lib/sources/streflop/libm/flt-32/e_lgammaf_r.cpp @@ -163,6 +163,7 @@ static Simple zero= 0.0000000000e+00f; GET_FLOAT_WORD(hx,x); /* purge off +-inf, NaN, +-0, and negative arguments */ + nadj = 0; *signgamp = 1; ix = hx&0x7fffffff; if(ix>=0x7f800000) return x*x;