swr: Fix GCC 4.9 checks.

Fixes: f0a22956be ("swr/rast: _mm*_undefined_* implementations for gcc<4.9")
Fixes: e21fc2c625 ("swr/rast: non-regex knob fallback code for gcc < 4.9")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Jan Zielinski <jan.zielinski@intel.com>
(cherry picked from commit deb2bbf57e)
This commit is contained in:
Vinson Lee 2020-02-01 01:12:32 -08:00 committed by Dylan Baker
parent 51f7d81dd2
commit bd934ff613
3 changed files with 3 additions and 3 deletions

View file

@ -319,7 +319,7 @@
"description": "swr: Fix GCC 4.9 checks.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "f0a22956be4802e01f2b4f3244f011212626f12d"
},

View file

@ -43,7 +43,7 @@
//========================================================
void KnobBase::autoExpandEnvironmentVariables(std::string& text)
{
#if (__GNUC__) && (GCC_VERSION < 409000)
#if (__GNUC__) && (GCC_VERSION < 40900)
// <regex> isn't implemented prior to gcc-4.9.0
// unix style variable replacement
size_t start;

View file

@ -182,7 +182,7 @@ static INLINE void _mm256_storeu2_m128i(__m128i* hi, __m128i* lo, __m256i a)
}
// gcc prior to 4.9 doesn't have _mm*_undefined_*
#if (__GNUC__) && (GCC_VERSION < 409000)
#if (__GNUC__) && (GCC_VERSION < 40900)
#define _mm_undefined_si128 _mm_setzero_si128
#define _mm256_undefined_ps _mm256_setzero_ps
#endif