Now we know all container images used for tcg-tests are x86_64 only, we don't need to specify anymore which arch they support.
Signed-off-by: Pierrick Bouvier <[email protected]> --- tests/tcg/aarch64/meson.build | 2 -- tests/tcg/aarch64/system/meson.build | 1 - tests/tcg/aarch64_be/meson.build | 1 - tests/tcg/alpha/meson.build | 2 -- tests/tcg/alpha/system/meson.build | 1 - tests/tcg/arm/meson.build | 2 -- tests/tcg/arm/system/meson.build | 1 - tests/tcg/hexagon/meson.build | 1 - tests/tcg/hppa/meson.build | 1 - tests/tcg/i386/meson.build | 2 -- tests/tcg/i386/system/meson.build | 1 - tests/tcg/loongarch64/meson.build | 2 -- tests/tcg/loongarch64/system/meson.build | 1 - tests/tcg/m68k/meson.build | 1 - tests/tcg/meson.build | 11 +---------- tests/tcg/mips/meson.build | 1 - tests/tcg/mips64/meson.build | 1 - tests/tcg/mips64el/meson.build | 1 - tests/tcg/or1k/meson.build | 1 - tests/tcg/ppc64/meson.build | 1 - tests/tcg/ppc64le/meson.build | 1 - tests/tcg/riscv64/meson.build | 2 -- tests/tcg/riscv64/system/meson.build | 1 - tests/tcg/s390x/meson.build | 2 -- tests/tcg/s390x/system/meson.build | 1 - tests/tcg/sh4/meson.build | 1 - tests/tcg/tricore/meson.build | 1 - tests/tcg/x86_64/meson.build | 2 -- tests/tcg/x86_64/system/meson.build | 1 - tests/tcg/xtensa/meson.build | 3 --- 30 files changed, 1 insertion(+), 49 deletions(-) diff --git a/tests/tcg/aarch64/meson.build b/tests/tcg/aarch64/meson.build index 28498e82cba..cc2c59fb4b6 100644 --- a/tests/tcg/aarch64/meson.build +++ b/tests/tcg/aarch64/meson.build @@ -1,6 +1,5 @@ cc = 'aarch64-linux-gnu-gcc' cc_dockerfile = 'debian-all-test-cross' -cc_docker_host_arch = ['aarch64', 'x86_64'] cc_feat_cflags = { 'aes': '-march=armv8-a+aes', @@ -198,7 +197,6 @@ if 'qemu-aarch64' in emulators 'aarch64-linux-user': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'cc_feat_cflags': cc_feat_cflags, 'folder': 'aarch64', 'gdb_arch': 'aarch64', diff --git a/tests/tcg/aarch64/system/meson.build b/tests/tcg/aarch64/system/meson.build index 94e16ba3300..6ba35a9f722 100644 --- a/tests/tcg/aarch64/system/meson.build +++ b/tests/tcg/aarch64/system/meson.build @@ -97,7 +97,6 @@ if 'qemu-system-aarch64' in emulators 'aarch64-softmmu': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'cc_feat_cflags': cc_feat_cflags, 'folder': 'aarch64/system', 'gdb_arch': 'aarch64', diff --git a/tests/tcg/aarch64_be/meson.build b/tests/tcg/aarch64_be/meson.build index 9ea111f9885..e45a49ec2da 100644 --- a/tests/tcg/aarch64_be/meson.build +++ b/tests/tcg/aarch64_be/meson.build @@ -11,7 +11,6 @@ if 'qemu-aarch64_be' in emulators 'aarch64_be-linux-user': { 'cc': 'aarch64-linux-gnu-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['aarch64', 'x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'aarch64_be', 'gdb_arch': 'aarch64_be', diff --git a/tests/tcg/alpha/meson.build b/tests/tcg/alpha/meson.build index fe60ce2496a..30ea2a6978e 100644 --- a/tests/tcg/alpha/meson.build +++ b/tests/tcg/alpha/meson.build @@ -1,6 +1,5 @@ cc = 'alpha-linux-gnu-gcc' cc_dockerfile = 'debian-all-test-cross' -cc_docker_host_arch = ['aarch64', 'x86_64'] subdir('system') @@ -45,7 +44,6 @@ if 'qemu-alpha' in emulators 'alpha-linux-user': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'alpha', 'gdb_arch': 'alpha', 'qemu': emulators['qemu-alpha'], diff --git a/tests/tcg/alpha/system/meson.build b/tests/tcg/alpha/system/meson.build index b10f2c3e28d..5388e17a2f7 100644 --- a/tests/tcg/alpha/system/meson.build +++ b/tests/tcg/alpha/system/meson.build @@ -37,7 +37,6 @@ if 'qemu-system-alpha' in emulators 'alpha-softmmu': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'alpha/system', 'gdb_arch': 'alpha', 'qemu': emulators['qemu-system-alpha'], diff --git a/tests/tcg/arm/meson.build b/tests/tcg/arm/meson.build index 1b491cea026..30154efaec8 100644 --- a/tests/tcg/arm/meson.build +++ b/tests/tcg/arm/meson.build @@ -1,6 +1,5 @@ cc = 'arm-linux-gnueabihf-gcc' cc_dockerfile = 'debian-all-test-cross' -cc_docker_host_arch = ['aarch64', 'x86_64'] subdir('system') @@ -70,7 +69,6 @@ if 'qemu-arm' in emulators 'arm-linux-user': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'arm', 'gdb_arch': 'arm', 'qemu': emulators['qemu-arm'], diff --git a/tests/tcg/arm/system/meson.build b/tests/tcg/arm/system/meson.build index 52869976704..93d0cfec24e 100644 --- a/tests/tcg/arm/system/meson.build +++ b/tests/tcg/arm/system/meson.build @@ -65,7 +65,6 @@ if 'qemu-system-arm' in emulators 'arm-softmmu': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'arm/system', 'gdb_arch': 'arm', 'qemu': emulators['qemu-system-arm'], diff --git a/tests/tcg/hexagon/meson.build b/tests/tcg/hexagon/meson.build index 6e36a9a1220..f3d20091aa9 100644 --- a/tests/tcg/hexagon/meson.build +++ b/tests/tcg/hexagon/meson.build @@ -111,7 +111,6 @@ if 'qemu-hexagon' in emulators 'hexagon-linux-user': { 'cc': 'hexagon-unknown-linux-musl-clang', 'cc_dockerfile': 'debian-hexagon-cross', - 'cc_docker_host_arch': ['x86_64'], 'folder': 'hexagon', 'gdb_arch': 'hexagon_is_not_supported_by_gdb', 'qemu': emulators['qemu-hexagon'], diff --git a/tests/tcg/hppa/meson.build b/tests/tcg/hppa/meson.build index 9ca8f29fa93..01d4554d993 100644 --- a/tests/tcg/hppa/meson.build +++ b/tests/tcg/hppa/meson.build @@ -11,7 +11,6 @@ if 'qemu-hppa' in emulators 'hppa-linux-user': { 'cc': 'hppa-linux-gnu-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'hppa', 'gdb_arch': 'hppa', diff --git a/tests/tcg/i386/meson.build b/tests/tcg/i386/meson.build index 5cda03655fa..04d438a062a 100644 --- a/tests/tcg/i386/meson.build +++ b/tests/tcg/i386/meson.build @@ -1,6 +1,5 @@ cc = 'i686-linux-gnu-gcc' cc_dockerfile = 'debian-i686-cross' -cc_docker_host_arch = ['x86_64'] subdir('system') @@ -48,7 +47,6 @@ if 'qemu-i386' in emulators 'i386-linux-user': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'i386', 'gdb_arch': 'i386', 'qemu': emulators['qemu-i386'], diff --git a/tests/tcg/i386/system/meson.build b/tests/tcg/i386/system/meson.build index d3f73997c7f..0986f5898d4 100644 --- a/tests/tcg/i386/system/meson.build +++ b/tests/tcg/i386/system/meson.build @@ -39,7 +39,6 @@ if 'qemu-system-i386' in emulators 'i386-softmmu': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'i386/system', 'gdb_arch': 'i386', 'qemu': emulators['qemu-system-i386'], diff --git a/tests/tcg/loongarch64/meson.build b/tests/tcg/loongarch64/meson.build index 1d62de64ed6..4dd64f16d87 100644 --- a/tests/tcg/loongarch64/meson.build +++ b/tests/tcg/loongarch64/meson.build @@ -1,6 +1,5 @@ cc = 'loongarch64-unknown-linux-gnu-gcc' cc_dockerfile = 'debian-loongarch-cross' -cc_docker_host_arch = ['x86_64'] subdir('system') @@ -22,7 +21,6 @@ if 'qemu-loongarch64' in emulators 'loongarch64-linux-user': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'loongarch64', 'gdb_arch': 'loongarch64', 'qemu': emulators['qemu-loongarch64'], diff --git a/tests/tcg/loongarch64/system/meson.build b/tests/tcg/loongarch64/system/meson.build index 5bf4c56e385..035dd5f85fb 100644 --- a/tests/tcg/loongarch64/system/meson.build +++ b/tests/tcg/loongarch64/system/meson.build @@ -38,7 +38,6 @@ if 'qemu-system-loongarch64' in emulators 'loongarch64-softmmu': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'loongarch64/system', 'gdb_arch': 'loongarch64', 'qemu': emulators['qemu-system-loongarch64'], diff --git a/tests/tcg/m68k/meson.build b/tests/tcg/m68k/meson.build index 8ecf450ac68..4b73d7fc57d 100644 --- a/tests/tcg/m68k/meson.build +++ b/tests/tcg/m68k/meson.build @@ -12,7 +12,6 @@ if 'qemu-m68k' in emulators 'm68k-linux-user': { 'cc': 'm68k-linux-gnu-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'm68k', 'gdb_arch': 'm68k', diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 4cf4865461e..f46516d6e72 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -22,7 +22,6 @@ tcg_tests = {} # 'name_of_target': { # 'cc': 'cross_compiler', # 'cc_dockerfile': 'name_of_dockerfile', -# 'cc_docker_host_arch': ['host_arch_supported (meson cpu)', ...], # 'cc_feat_cflags': { # 'name': ['feature cflags'], # ... @@ -208,7 +207,7 @@ foreach target, plan: tcg_tests # return a clear error if user misspell a target entry foreach key, _ : plan - allowed = ['cc', 'cc_dockerfile', 'cc_docker_host_arch', 'cc_feat_cflags', + allowed = ['cc', 'cc_dockerfile', 'cc_feat_cflags', 'folder', 'gdb_arch', 'gdb_feat_version', 'qemu', 'tests'] if key not in allowed error('unknown tcg test plan entry \'' + key + '\' for target ' + target + @@ -255,14 +254,6 @@ foreach target, plan: tcg_tests if 'cc_dockerfile' in plan cc_dockerfile = plan['cc_dockerfile'] - cc_docker_host_arch = plan['cc_docker_host_arch'] - allowed = ['aarch64', 'x86_64'] - foreach arch: cc_docker_host_arch - if arch not in allowed - error('incorrect docker arch ' + arch + ' for target ' + - target + ' (possible: [' + ', '.join(allowed) + '])') - endif - endforeach dockerfile = files('..'/'docker'/'dockerfiles'/cc_dockerfile + '.docker') image_name = 'image-' + cc_dockerfile if cc_dockerfile not in image_targets and docker_supported diff --git a/tests/tcg/mips/meson.build b/tests/tcg/mips/meson.build index 3c4f6ec482d..efda857ab61 100644 --- a/tests/tcg/mips/meson.build +++ b/tests/tcg/mips/meson.build @@ -14,7 +14,6 @@ if 'qemu-mips' in emulators 'mips-linux-user': { 'cc': 'mips-linux-gnu-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['aarch64', 'x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'mips', 'gdb_arch': 'mips', diff --git a/tests/tcg/mips64/meson.build b/tests/tcg/mips64/meson.build index 69391c23187..b8eb6705eae 100644 --- a/tests/tcg/mips64/meson.build +++ b/tests/tcg/mips64/meson.build @@ -16,7 +16,6 @@ if 'qemu-mips64' in emulators 'mips64-linux-user': { 'cc': 'mips64-linux-gnuabi64-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['aarch64', 'x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'mips64', 'gdb_arch': 'mips64', diff --git a/tests/tcg/mips64el/meson.build b/tests/tcg/mips64el/meson.build index f6c0fae7981..2aafbba750d 100644 --- a/tests/tcg/mips64el/meson.build +++ b/tests/tcg/mips64el/meson.build @@ -3,7 +3,6 @@ if 'qemu-mips64el' in emulators 'mips64el-linux-user': { 'cc': 'mips64el-linux-gnuabi64-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['aarch64', 'x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'mips64el', 'gdb_arch': 'mips64el', diff --git a/tests/tcg/or1k/meson.build b/tests/tcg/or1k/meson.build index 5151e8f361f..c89bb372b47 100644 --- a/tests/tcg/or1k/meson.build +++ b/tests/tcg/or1k/meson.build @@ -61,7 +61,6 @@ if 'qemu-or1k' in emulators 'or1k-linux-user': { 'cc': 'or1k-none-linux-musl-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'or1k', 'gdb_arch': 'or1k', diff --git a/tests/tcg/ppc64/meson.build b/tests/tcg/ppc64/meson.build index c7e495f3d34..8cca4d65a4c 100644 --- a/tests/tcg/ppc64/meson.build +++ b/tests/tcg/ppc64/meson.build @@ -44,7 +44,6 @@ if 'qemu-ppc64' in emulators 'ppc64-linux-user': { 'cc': 'powerpc64-linux-gnu-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'ppc64', 'gdb_arch': 'ppc64', diff --git a/tests/tcg/ppc64le/meson.build b/tests/tcg/ppc64le/meson.build index 720aa167f23..a0f3e62e4d3 100644 --- a/tests/tcg/ppc64le/meson.build +++ b/tests/tcg/ppc64le/meson.build @@ -3,7 +3,6 @@ if 'qemu-ppc64le' in emulators 'ppc64le-linux-user': { 'cc': 'powerpc64le-linux-gnu-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'ppc64le', 'gdb_arch': 'ppc64le', diff --git a/tests/tcg/riscv64/meson.build b/tests/tcg/riscv64/meson.build index 2292bf8ed1b..5ee20a1e98d 100644 --- a/tests/tcg/riscv64/meson.build +++ b/tests/tcg/riscv64/meson.build @@ -1,6 +1,5 @@ cc = 'riscv64-linux-gnu-gcc' cc_dockerfile = 'debian-all-test-cross' -cc_docker_host_arch = ['aarch64', 'x86_64'] subdir('system') @@ -28,7 +27,6 @@ if 'qemu-riscv64' in emulators 'riscv64-linux-user': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'riscv64', 'gdb_arch': 'riscv64', 'qemu': emulators['qemu-riscv64'], diff --git a/tests/tcg/riscv64/system/meson.build b/tests/tcg/riscv64/system/meson.build index 8604c2a45a9..87c3f9f11ce 100644 --- a/tests/tcg/riscv64/system/meson.build +++ b/tests/tcg/riscv64/system/meson.build @@ -66,7 +66,6 @@ if 'qemu-system-riscv64' in emulators 'riscv64-softmmu': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'riscv64', 'gdb_arch': 'riscv64', 'qemu': emulators['qemu-system-riscv64'], diff --git a/tests/tcg/s390x/meson.build b/tests/tcg/s390x/meson.build index c9af66aa1b0..35e27b47141 100644 --- a/tests/tcg/s390x/meson.build +++ b/tests/tcg/s390x/meson.build @@ -1,6 +1,5 @@ cc = 's390x-linux-gnu-gcc' cc_dockerfile = 'debian-all-test-cross' -cc_docker_host_arch = ['aarch64', 'x86_64'] cc_feat_cflags = { 'z14': '-march=z14', @@ -131,7 +130,6 @@ if 'qemu-s390x' in emulators 's390x-linux-user': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'cc_feat_cflags': cc_feat_cflags, 'folder': 's390x', 'gdb_arch': 's390x', diff --git a/tests/tcg/s390x/system/meson.build b/tests/tcg/s390x/system/meson.build index 1e360e70821..ef19c4831fd 100644 --- a/tests/tcg/s390x/system/meson.build +++ b/tests/tcg/s390x/system/meson.build @@ -83,7 +83,6 @@ if 'qemu-system-s390x' in emulators 's390x-softmmu': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'cc_feat_cflags': cc_feat_cflags, 'folder': 's390x', 'gdb_arch': 's390x', diff --git a/tests/tcg/sh4/meson.build b/tests/tcg/sh4/meson.build index d73df074497..12b24fffc77 100644 --- a/tests/tcg/sh4/meson.build +++ b/tests/tcg/sh4/meson.build @@ -14,7 +14,6 @@ if 'qemu-sh4' in emulators 'sh4-linux-user': { 'cc': 'sh4-linux-gnu-gcc', 'cc_dockerfile': 'debian-all-test-cross', - 'cc_docker_host_arch': ['aarch64', 'x86_64'], 'cc_feat_cflags': cc_feat_cflags, 'folder': 'sh4', 'gdb_arch': 'sh4', diff --git a/tests/tcg/tricore/meson.build b/tests/tcg/tricore/meson.build index d0bf55dedce..837a3d5e22f 100644 --- a/tests/tcg/tricore/meson.build +++ b/tests/tcg/tricore/meson.build @@ -47,7 +47,6 @@ if 'qemu-system-tricore' in emulators 'tricore-softmmu': { 'cc': 'tricore-gcc', 'cc_dockerfile': 'debian-tricore-cross', - 'cc_docker_host_arch': ['x86_64'], 'folder': 'tricore', 'gdb_arch': 'tricore', 'qemu': emulators['qemu-system-tricore'], diff --git a/tests/tcg/x86_64/meson.build b/tests/tcg/x86_64/meson.build index ab336eca9b2..787a2ca61b2 100644 --- a/tests/tcg/x86_64/meson.build +++ b/tests/tcg/x86_64/meson.build @@ -1,6 +1,5 @@ cc = 'x86_64-linux-gnu-gcc' cc_dockerfile = 'debian-amd64-cross' -cc_docker_host_arch = ['x86_64'] subdir('system') @@ -74,7 +73,6 @@ if 'qemu-x86_64' in emulators 'x86_64-linux-user': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'x86_64', 'gdb_arch': 'x86_64', 'qemu': emulators['qemu-x86_64'], diff --git a/tests/tcg/x86_64/system/meson.build b/tests/tcg/x86_64/system/meson.build index 80110d0ae57..43e7d7afa85 100644 --- a/tests/tcg/x86_64/system/meson.build +++ b/tests/tcg/x86_64/system/meson.build @@ -53,7 +53,6 @@ if 'qemu-system-x86_64' in emulators 'x86_64-softmmu': { 'cc': cc, 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'x86_64/system', 'gdb_arch': 'x86_64', 'qemu': emulators['qemu-system-x86_64'], diff --git a/tests/tcg/xtensa/meson.build b/tests/tcg/xtensa/meson.build index bb1dd1542e5..5ff9c6cd548 100644 --- a/tests/tcg/xtensa/meson.build +++ b/tests/tcg/xtensa/meson.build @@ -79,14 +79,12 @@ foreach core: cores endforeach cc_dockerfile = 'debian-xtensa-cross' -cc_docker_host_arch = ['x86_64'] if 'qemu-system-xtensa' in emulators tcg_tests += { 'xtensa-softmmu': { 'cc': 'xtensa-dc232b-elf-gcc', 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'xtensa', 'gdb_arch': 'xtensa', 'qemu': emulators['qemu-system-xtensa'], @@ -100,7 +98,6 @@ if 'qemu-system-xtensaeb' in emulators 'xtensaeb-softmmu': { 'cc': 'xtensa-test_kc705_be-elf-gcc', 'cc_dockerfile': cc_dockerfile, - 'cc_docker_host_arch': cc_docker_host_arch, 'folder': 'xtensa', 'gdb_arch': 'xtensaeb', 'qemu': emulators['qemu-system-xtensaeb'], -- 2.43.0
