diff options
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/common/os.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index a442be492f4..af4f23fb12f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp index 1ef83ad10d1..b073f73e3a0 100644 --- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp +++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp @@ -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; diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h index e812da39851..7d33f6d99d6 100644 --- a/src/gallium/drivers/swr/rasterizer/common/os.h +++ b/src/gallium/drivers/swr/rasterizer/common/os.h @@ -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 |