From 1eba4da21aec5c129f3a8c6a7cd55a4110412959 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sat, 26 Oct 2013 19:21:00 -0500 Subject: [PATCH] Revert "Fixes GCC 4.9 compilation. It now supplies its own _mm_shuffle_epi8 intrinsic." This reverts commit b2c4901b3f31007aeec5d6428ef89f16b6535835. Breaks Windows build. GCC 4.9 isn't out yet anyway. --- Source/Core/Common/Src/CommonFuncs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index 0c886c782c..daf135373e 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -30,8 +30,8 @@ struct ArraySizeImpl : public std::extent #define b16(x) ( b8(x) | ( b8(x) >> 8) ) #define b32(x) (b16(x) | (b16(x) >>16) ) #define ROUND_UP_POW2(x) (b32(x - 1) + 1) -#if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) \ - && !defined __SSSE3__ && !defined _M_GENERIC + +#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC #include static __inline __m128i __attribute__((__always_inline__)) _mm_shuffle_epi8(__m128i a, __m128i mask)