On 2/16/21 11:25 AM, Alex Bennée wrote: > Blink and you miss the cross TCG compiler stuff so lets display it > with the rest of the compiler information. > > Signed-off-by: Alex Bennée <[email protected]> > > --- > v2 > - use target_dirs/fs.exists() instead of find > --- > meson.build | 18 ++++++++++++++++++ > tests/tcg/configure.sh | 8 -------- > 2 files changed, 18 insertions(+), 8 deletions(-) > > diff --git a/meson.build b/meson.build > index a923f249d8..4462e7279e 100644 > --- a/meson.build > +++ b/meson.build > @@ -2508,6 +2508,24 @@ endif > summary_info += {'strip binaries': get_option('strip')} > summary_info += {'sparse': sparse.found() ? sparse.full_path() : > false} > summary_info += {'mingw32 support': targetos == 'windows'} > + > +# snarf the cross-compilation information for tests > +foreach target: target_dirs > + tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target + > '.mak' > + if fs.exists(tcg_mak) > + config_cross_tcg = keyval.load(tcg_mak) > + target = config_cross_tcg['TARGET_NAME'] > + compiler = '' > + if 'DOCKER_CROSS_CC_GUEST' in config_cross_tcg > + summary_info += {target + ' tests': > config_cross_tcg['DOCKER_CROSS_CC_GUEST'] + > + ' via ' + > config_cross_tcg['DOCKER_IMAGE']} > + elif 'CROSS_CC_GUEST' in config_cross_tcg > + summary_info += {target + ' tests' > + : config_cross_tcg['CROSS_CC_GUEST'] } > + endif > + endif > +endforeach > + > summary(summary_info, bool_yn: true, section: 'Compilation')
Testing on top of "Reintroduce the R5900 CPU": https://www.mail-archive.com/[email protected]/msg782449.html Compilation ... CFI support : NO strip binaries : NO sparse : /usr/bin/cgcc mingw32 support : NO mipsel tests : mipsel-linux-gnu-gcc via debian-mipsel-cross r5900o32el tests : mipsr5900el-unknown-linux-gnu-gcc via gentoo-mipsr5900el-cross mips64el tests : mips64el-linux-gnuabi64-gcc via debian-mips64el-cross Targets and accelerators TCG support : YES TCG backend : native (x86_64) TCG debug enabled : YES target list : mipsel-linux-user r5900o32el-linux-user mips64el-linux-user Tested-by: Philippe Mathieu-Daudé <[email protected]>
