Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Create a new configuration data object and return it as the result.

This commit is contained in:
Jussi Pakkanen 2017-02-23 00:21:01 +02:00
parent fe86c9c399
commit 6119beed4d
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mesonbuild/modules/simd.py
View File

@ -46,11 +46,8 @@ class SimdModule(ExtensionModule):
compiler = kwargs['compiler'].compiler compiler = kwargs['compiler'].compiler
if not isinstance(compiler, compilers.Compiler): if not isinstance(compiler, compilers.Compiler):
raise mesonlib.MesonException('Compiler argument must be a compiler object.') raise mesonlib.MesonException('Compiler argument must be a compiler object.')
if 'configuration' not in kwargs: cdata = interpreter.func_configuration_data(None, [], {})
raise mesonlib.MesonException('Must specify configuration object.') conf = cdata.held_object
conf = kwargs['configuration'].held_object
if not isinstance(conf, build.ConfigurationData):
raise mesonlib.MesonException('Configuration must be a configuration object.')
for iset in self.isets: for iset in self.isets:
if iset not in kwargs: if iset not in kwargs:
continue continue
@ -69,7 +66,7 @@ class SimdModule(ExtensionModule):
lib_kwargs = {'sources': iset_fname, lib_kwargs = {'sources': iset_fname,
compiler.get_language() + '_args': args} compiler.get_language() + '_args': args}
result.append(interpreter.func_static_lib(None, [libname], lib_kwargs)) result.append(interpreter.func_static_lib(None, [libname], lib_kwargs))
return result return [result, cdata]
def initialize(): def initialize():
return SimdModule() return SimdModule()

9
test cases/common/139 simd/meson.build
View File

@ -4,8 +4,6 @@ simd = import('simd')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
cdata = configuration_data()
if not meson.is_cross_build() and host_machine.cpu_family() == 'arm' and cc.get_id() == 'clang' if not meson.is_cross_build() and host_machine.cpu_family() == 'arm' and cc.get_id() == 'clang'
message('Adding -march=armv7 because assuming that this build happens on Raspbian.') message('Adding -march=armv7 because assuming that this build happens on Raspbian.')
message('Its Clang seems to be misconfigured and does not support NEON by default.') message('Its Clang seems to be misconfigured and does not support NEON by default.')
@ -16,7 +14,8 @@ if cc.get_id() == 'msvc' and cc.version().version_compare('<17')
error('MESON_SKIP_TEST VS2010 produces broken binaries on x86.') error('MESON_SKIP_TEST VS2010 produces broken binaries on x86.')
endif endif
simdlibs = simd.check('mysimds', # FIXME add [a, b] = function()
rval = simd.check('mysimds',
mmx : 'simd_mmx.c', mmx : 'simd_mmx.c',
sse : 'simd_sse.c', sse : 'simd_sse.c',
sse2 : 'simd_sse2.c', sse2 : 'simd_sse2.c',
@ -27,9 +26,11 @@ simdlibs = simd.check('mysimds',
avx : 'simd_avx.c', avx : 'simd_avx.c',
avx2 : 'simd_avx2.c', avx2 : 'simd_avx2.c',
neon : 'simd_neon.c', neon : 'simd_neon.c',
configuration : cdata,
compiler : cc) compiler : cc)
simdlibs = rval[0]
# FIXME add cdata1.merge_from(cdata2)
cdata = rval[1]
configure_file(output : 'simdconfig.h', configure_file(output : 'simdconfig.h',
configuration : cdata) configuration : cdata)