ref: e06232862237466679ec2ea8326111e06e5d3a99
parent: 1df181649d2b8cd46e517d01fd82d36bad0f7f2f
author: James Almer <[email protected]>
date: Wed Jun 5 14:51:28 EDT 2019
meson: simplify a few checks for x86 targets
--- a/meson.build
+++ b/meson.build
@@ -293,24 +293,14 @@
endif
endif
+cdata.set10('ARCH_X86', host_machine.cpu_family().startswith('x86'))
+cdata.set10('ARCH_X86_64', host_machine.cpu_family() == 'x86_64')
+cdata.set10('ARCH_X86_32', host_machine.cpu_family() == 'x86')
+
if host_machine.cpu_family().startswith('x86')
- cdata.set10('ARCH_X86', true)
- if host_machine.cpu_family() == 'x86_64'
- cdata_asm.set10('ARCH_X86_64', true)
- cdata.set10('ARCH_X86_64', true)
- cdata_asm.set10('ARCH_X86_32', false)
- cdata.set10('ARCH_X86_32', false)
- else
- cdata_asm.set10('ARCH_X86_64', false)
- cdata.set10('ARCH_X86_64', false)
- cdata_asm.set10('ARCH_X86_32', true)
- cdata.set10('ARCH_X86_32', true)
- cdata_asm.set10('PIC', true)
- endif
-else
- cdata.set10('ARCH_X86', false)
- cdata.set10('ARCH_X86_64', false)
- cdata.set10('ARCH_X86_32', false)
+ cdata_asm.set10('ARCH_X86_64', host_machine.cpu_family() == 'x86_64')
+ cdata_asm.set10('ARCH_X86_32', host_machine.cpu_family() == 'x86')
+ cdata_asm.set10('PIC', true)
endif
if cc.symbols_have_underscore_prefix()