From df143fa1ef6e4d97a8a3d50326a5a51ac30b4d49 Mon Sep 17 00:00:00 2001 From: Michel Zou Date: Wed, 25 Nov 2020 15:46:36 +0100 Subject: [PATCH] glsl: Drop mingw -O1 workaround for GCC>=7.3 Reviewed-by: Jose Fonseca Part-of: --- src/compiler/glsl/builtin_functions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index 5e5e966b771..10eec67f83f 100644 --- a/src/compiler/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp @@ -64,10 +64,10 @@ * MinGW 4.6.3 (in Ubuntu 13.10) does not have this bug. * MinGW 5.3.1 (in Ubuntu 16.04) definitely has this bug. * MinGW 6.2.0 (in Ubuntu 16.10) definitely has this bug. - * MinGW x.y.z - don't know. Assume versions after 4.6.x are buggy + * MinGW 7.3.0 (in Ubuntu 18.04) does not have this bug. Assume versions before 7.3.x are buggy */ -#if defined(__MINGW32__) && ((__GNUC__ * 100) + __GNUC_MINOR >= 407) +#if defined(__MINGW32__) && ((__GNUC__ * 100) + __GNUC_MINOR < 703) #warning "disabling optimizations for this file to work around compiler bug" #pragma GCC optimize("O1") #endif