From bd2dd039375b17f74751fc6370c60e3b9d148b09 Mon Sep 17 00:00:00 2001 From: Philippe Lecluse Date: Tue, 22 Nov 2022 07:27:46 -0800 Subject: [PATCH] intel: Disable SSE2 instruction set if building for non x86 architectures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Lecluse Signed-off-by: José Roberto de Souza Reviewed-by: Marcin Ślusarz Part-of: --- src/intel/isl/meson.build | 2 +- src/intel/meson.build | 7 ++++++- src/intel/perf/meson.build | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 50c60f87511..2abe0430aa4 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -101,7 +101,7 @@ isl_tiled_memcpy = static_library( 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, c_sse2_arg], gnu_symbol_visibility : 'hidden', extra_files : ['isl_tiled_memcpy.c'] ) diff --git a/src/intel/meson.build b/src/intel/meson.build index ad77e11e3bb..53e72e5eebb 100644 --- a/src/intel/meson.build +++ b/src/intel/meson.build @@ -18,7 +18,12 @@ # 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 = [] +c_sse2_arg = [] +if ['x86', 'x86_64'].contains(host_machine.cpu_family()) + c_sse2_arg = ['-msse2'] + c_sse2_args = [c_sse2_arg, '-mstackrealign'] +endif inc_intel = include_directories('.') subdir('genxml') diff --git a/src/intel/perf/meson.build b/src/intel/perf/meson.build index f6d0d0cb29e..acfe0c94c19 100644 --- a/src/intel/perf/meson.build +++ b/src/intel/perf/meson.build @@ -38,8 +38,8 @@ libintel_perf = static_library( include_directories : [ inc_include, inc_src, inc_intel, ], - c_args : [no_override_init_args, '-msse2'], - cpp_args : ['-msse2'], + c_args : [no_override_init_args, c_sse2_arg], + cpp_args : [c_sse2_arg], gnu_symbol_visibility : 'hidden', )