Skip to content

Add VC 2015 32-bit support #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+1 −1
Open

Add VC 2015 32-bit support #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccfdb76
Skip defining _mm_set_epi64x on VS 2015+
jakirkham Jul 7, 2017
54dce50
Merge branch 'master' into vc14_32bit
jakirkham Jul 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/include/clRNG/private/Random123/features/sse.h
View file
Original file line number Diff line number Diff line change
@@ -90,7 +90,7 @@ R123_STATIC_INLINE int haveAESNI(){
// R123_USE_feature tests for each of these in each of the
// compilerfeatures.h files we just keep the complexity localized
// to here...
#if (defined(__ICC) && __ICC<1210) || (defined(_MSC_VER) && !defined(_WIN64))
#if (defined(__ICC) && __ICC<1210) || (defined(_MSC_VER) && !defined(_WIN64) && _MSC_VER<1900)
/* Is there an intrinsic to assemble an __m128i from two 64-bit words?
If not, use the 4x32-bit intrisic instead. N.B. It looks like Intel
added _mm_set_epi64x to icc version 12.1 in Jan 2012.