Skip to content

Commit

Permalink
Merge branch 'windows' into cuda9
Browse files Browse the repository at this point in the history
  • Loading branch information
KlausT committed Jan 27, 2018
2 parents b13573c + 1d5a2eb commit 9beb148
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
6 changes: 3 additions & 3 deletions ccminer-config-win.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
#define PACKAGE_NAME "ccminer"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "ccminer 8.19-KlausT"
#define PACKAGE_STRING "ccminer 8.20-KlausT"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ccminer"
Expand All @@ -165,7 +165,7 @@
#define PACKAGE_URL ""

/* Define to the version of this package. */
#define PACKAGE_VERSION "8.19-KlausT"
#define PACKAGE_VERSION "8.20-KlausT"

/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
Expand All @@ -188,7 +188,7 @@
//#define USE_XOP 1

/* Version number of package */
#define VERSION "8.19-KlausT"
#define VERSION "8.20-KlausT"

/* Define curl_free() as free() if our version of curl lacks curl_free. */
/* #undef curl_free */
Expand Down
19 changes: 18 additions & 1 deletion ccminer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2796,6 +2796,16 @@ static int msver(void)
return version;
}

bool strictaliasingtest(short *h, long *k)
{
*h = 5;
*k = 6;
if(*h == 5)
return true;
else
return false;
}

int main(int argc, char *argv[])
{
struct thr_info *thr;
Expand Down Expand Up @@ -2836,7 +2846,7 @@ int main(int argc, char *argv[])
if(CUDART_VERSION == 8000 && __GNUC__ > 5)
{
printf("WARNING! GCC %d IS NOT COMPATIBLE WITH CUDA 8!\n", __GNUC__);
printf("PLEASE USE GCC 5\n");
printf("PLEASE USE GCC 5\n\n");
}
if((CUDART_VERSION == 9000 || CUDART_VERSION == 9010) && __GNUC__ > 6)
{
Expand All @@ -2845,6 +2855,13 @@ int main(int argc, char *argv[])
}
#endif

long sat[1];
if(strictaliasingtest((short *)sat, sat))
{
printf("Warning! This build may produce wrong results or even crash!\n");
printf("Please use the -fno-strict-aliasing compiler option!\n\n");
}

rpc_user = strdup("");
rpc_pass = strdup("");

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([ccminer], [8.19-KlausT])
AC_INIT([ccminer], [8.20-KlausT])

AC_PREREQ([2.59c])
AC_CANONICAL_SYSTEM
Expand Down

0 comments on commit 9beb148

Please sign in to comment.