boostorg/predef
1
0
Fork 1
mirror of https://github.com/boostorg/predef.git synced 2025-07-29 11:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix redefinition of BOOST_HW_SIMD for x86 (AMD)

Browse Source
This commit is contained in:
Charly Chevalier
2015-12-08 10:40:33 +01:00
parent 8f5fcf9bdf
commit 1b27540a96
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/boost/predef/hardware/simd.h
View File

@ -77,12 +77,24 @@ http://www.boost.org/LICENSE_1_0.txt)
# error "Multiple SIMD architectures detected, this cannot happen!" # error "Multiple SIMD architectures detected, this cannot happen!"
#endif #endif
#if defined(BOOST_HW_SIMD_X86_AVAILABLE) #if defined(BOOST_HW_SIMD_X86_AVAILABLE) && defined(BOOST_HW_SIMD_X86_AMD_AVAILABLE)
# define BOOST_HW_SIMD BOOST_HW_SIMD_X86 // If both standard _X86 and _X86_AMD are available,
// then take the biggest version of the two!
# if BOOST_HW_SIMD_X86 >= BOOST_HW_SIMD_X86_AMD
# define BOOST_HW_SIMD BOOST_HW_SIMD_X86
# else
# define BOOST_HW_SIMD BOOST_HW_SIMD_X86_AMD
# endif
#endif #endif
#if defined(BOOST_HW_SIMD_X86_AMD_AVAILABLE) #if !defined(BOOST_HW_SIMD)
# define BOOST_HW_SIMD BOOST_HW_SIMD_X86_AMD // At this point, only one of these two is defined
# if defined(BOOST_HW_SIMD_X86_AVAILABLE)
# define BOOST_HW_SIMD BOOST_HW_SIMD_X86
# endif
# if defined(BOOST_HW_SIMD_X86_AMD_AVAILABLE)
# define BOOST_HW_SIMD BOOST_HW_SIMD_X86_AMD
# endif
#endif #endif
#if defined(BOOST_HW_SIMD_ARM_AVAILABLE) #if defined(BOOST_HW_SIMD_ARM_AVAILABLE)