diff --git a/n_no-sse2-on-ix86.patch b/n_no-sse2-on-ix86.patch index cb9e2cd..843a1ad 100644 --- a/n_no-sse2-on-ix86.patch +++ b/n_no-sse2-on-ix86.patch @@ -1,9 +1,16 @@ ---- mesa-21.3.3/meson.build.orig 2022-01-06 17:30:29.318317000 +0100 -+++ mesa-21.3.3/meson.build 2022-01-06 17:31:48.709078000 +0100 -@@ -1237,24 +1237,9 @@ if host_machine.cpu_family().startswith( - sse41_args = ['-msse4.1'] +diff -u -r mesa-21.3.3.orig/meson.build mesa-21.3.3/meson.build +--- mesa-21.3.3.orig/meson.build 2022-01-06 19:34:26.332485000 +0100 ++++ mesa-21.3.3/meson.build 2022-01-06 19:32:11.286680000 +0100 +@@ -1231,35 +1231,8 @@ + endif + endif - if host_machine.cpu_family() == 'x86' +-if host_machine.cpu_family().startswith('x86') and cc.get_id() != 'msvc' +- pre_args += '-DUSE_SSE41' +- with_sse41 = true +- sse41_args = ['-msse4.1'] +- +- if host_machine.cpu_family() == 'x86' - if get_option('sse2') - # These settings make generated GCC code match MSVC and follow - # GCC advice on https://gcc.gnu.org/wiki/FloatingPointMath#x86note @@ -22,9 +29,50 @@ - # that's not guaranteed - sse41_args += '-mstackrealign' - endif -+ # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but -+ # that's not guaranteed -+ sse41_args += '-mstackrealign' - endif - else - with_sse41 = false +- endif +-else +- with_sse41 = false +- sse41_args = [] +-endif ++with_sse41 = false ++sse41_args = [] + + # Check for GCC style atomics + dep_atomic = null_dep +diff -u -r mesa-21.3.3.orig/src/intel/isl/meson.build mesa-21.3.3/src/intel/isl/meson.build +--- mesa-21.3.3.orig/src/intel/isl/meson.build 2022-01-06 19:33:10.676509000 +0100 ++++ mesa-21.3.3/src/intel/isl/meson.build 2022-01-06 19:40:58.929557000 +0100 +@@ -99,7 +99,7 @@ + inc_include, inc_src, inc_mesa, inc_gallium, inc_intel, + ], + dependencies : idep_mesautil, +- c_args : [no_override_init_args, '-msse2'], ++ c_args : [no_override_init_args, ], + gnu_symbol_visibility : 'hidden', + extra_files : ['isl_tiled_memcpy.c'] + ) +diff -u -r mesa-21.3.3.orig/src/intel/meson.build mesa-21.3.3/src/intel/meson.build +--- mesa-21.3.3.orig/src/intel/meson.build 2022-01-06 19:33:19.801577000 +0100 ++++ mesa-21.3.3/src/intel/meson.build 2022-01-06 19:46:08.372577000 +0100 +@@ -18,7 +18,7 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + # SOFTWARE. + +-c_sse2_args = ['-msse2', '-mstackrealign'] ++c_sse2_args = ['-mstackrealign'] + inc_intel = include_directories('.') + + subdir('genxml') +diff -u -r mesa-21.3.3.orig/src/intel/perf/meson.build mesa-21.3.3/src/intel/perf/meson.build +--- mesa-21.3.3.orig/src/intel/perf/meson.build 2022-01-06 19:33:19.957531000 +0100 ++++ mesa-21.3.3/src/intel/perf/meson.build 2022-01-06 19:42:22.666599000 +0100 +@@ -37,7 +37,7 @@ + include_directories : [ + inc_include, inc_src, inc_intel, + ], +- c_args : [no_override_init_args, '-msse2'], +- cpp_args : ['-msse2'], ++ c_args : [no_override_init_args], ++ cpp_args : [], + gnu_symbol_visibility : 'hidden', + )