From 1af46e66dfccd2fbeb9640b68415c3c57050f196 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Fri, 31 Jul 2015 10:53:45 +0200 Subject: [PATCH] Add missing _X86_AMD detection for BOOST_HW_SIMD + Unique name --- include/boost/predef/hardware/simd.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/boost/predef/hardware/simd.h b/include/boost/predef/hardware/simd.h index b961a82..4de1e70 100644 --- a/include/boost/predef/hardware/simd.h +++ b/include/boost/predef/hardware/simd.h @@ -68,6 +68,9 @@ http://www.boost.org/LICENSE_1_0.txt) // We check if SIMD extension of multiples architectures have been detected, // if yes, then this is an error! +// +// NOTE: _X86_AMD implies _X86, so there is no need to check for it here! +// #if defined(BOOST_HW_SIMD_ARM_AVAILABLE) && defined(BOOST_HW_SIMD_PPC_AVAILABLE) ||\ defined(BOOST_HW_SIMD_ARM_AVAILABLE) && defined(BOOST_HW_SIMD_X86_AVAILABLE) ||\ defined(BOOST_HW_SIMD_PPC_AVAILABLE) && defined(BOOST_HW_SIMD_X86_AVAILABLE) @@ -76,26 +79,28 @@ http://www.boost.org/LICENSE_1_0.txt) #if defined(BOOST_HW_SIMD_X86_AVAILABLE) # define BOOST_HW_SIMD BOOST_HW_SIMD_X86 -# define BOOST_HW_SIMD_NAME BOOST_HW_SIMD_X86_NAME +#endif + +#if defined(BOOST_HW_SIMD_X86_AMD_AVAILABLE) +# define BOOST_HW_SIMD BOOST_HW_SIMD_X86_AMD #endif #if defined(BOOST_HW_SIMD_ARM_AVAILABLE) # define BOOST_HW_SIMD BOOST_HW_SIMD_ARM -# define BOOST_HW_SIMD_NAME BOOST_HW_SIMD_ARM_NAME #endif #if defined(BOOST_HW_SIMD_PPC_AVAILABLE) # define BOOST_HW_SIMD BOOST_HW_SIMD_PPC -# define BOOST_HW_SIMD_NAME BOOST_HW_SIMD_PPC_NAME #endif #if defined(BOOST_HW_SIMD) # define BOOST_HW_SIMD_AVAILABLE #else # define BOOST_HW_SIMD BOOST_VERSION_NUMBER_NOT_AVAILABLE -# define BOOST_HW_SIMD_NAME "Hardware SIMD" #endif +#define BOOST_HW_SIMD_NAME "Hardware SIMD" + #endif #include