[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/12] meson: avoid unused arguments of main() in compiler tests
|
From: |
Paolo Bonzini |
|
Subject: |
[PULL 06/12] meson: avoid unused arguments of main() in compiler tests |
|
Date: |
Sun, 6 Nov 2022 09:51:09 +0100 |
meson.build has one test where "main" is declared unnecessarily
with argc and argv arguments, but does not use them. Because
the test needs -Werror too, HAVE_BROKEN_SIZE_MAX is defined
incorrectly.
Fix the test and, for consistency, remove argc and argv whenever
they are not needed.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 1d448272ab88..cf3e517e56d8 100644
--- a/meson.build
+++ b/meson.build
@@ -2165,7 +2165,7 @@ config_host_data.set('CONFIG_SPLICE',
cc.links(gnu_source_prefix + '''
config_host_data.set('HAVE_MLOCKALL', cc.links(gnu_source_prefix + '''
#include <sys/mman.h>
- int main(int argc, char *argv[]) {
+ int main(void) {
return mlockall(MCL_FUTURE);
}'''))
@@ -2210,7 +2210,7 @@ config_host_data.set('HAVE_FSXATTR', cc.links('''
config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles('''
#include <stdint.h>
#include <stdio.h>
- int main(int argc, char *argv[]) {
+ int main(void) {
return printf("%zu", SIZE_MAX);
}''', args: ['-Werror']))
@@ -2327,7 +2327,7 @@ config_host_data.set('CONFIG_AVX2_OPT',
get_option('avx2') \
__m256i x = *(__m256i *)a;
return _mm256_testz_si256(x, x);
}
- int main(int argc, char *argv[]) { return bar(argv[0]); }
+ int main(int argc, char *argv[]) { return bar(argv[argc - 1]); }
'''), error_message: 'AVX2 not available').allowed())
config_host_data.set('CONFIG_AVX512F_OPT', get_option('avx512f') \
@@ -2341,7 +2341,7 @@ config_host_data.set('CONFIG_AVX512F_OPT',
get_option('avx512f') \
__m512i x = *(__m512i *)a;
return _mm512_test_epi64_mask(x, x);
}
- int main(int argc, char *argv[]) { return bar(argv[0]); }
+ int main(int argc, char *argv[]) { return bar(argv[argc - 1]); }
'''), error_message: 'AVX512F not available').allowed())
have_pvrdma = get_option('pvrdma') \
--
2.38.1
- [PULL 00/12] Misc bugfix patches (+ improved module errors) for QEMU 7.2, Paolo Bonzini, 2022/11/06
- [PULL 01/12] util/main-loop: Fix maximum number of wait objects for win32, Paolo Bonzini, 2022/11/06
- [PULL 02/12] util/main-loop: Avoid adding the same HANDLE twice, Paolo Bonzini, 2022/11/06
- [PULL 04/12] gdb-xml: Fix size of EFER register on i386 architecture when debugged by GDB, Paolo Bonzini, 2022/11/06
- [PULL 03/12] util/aio-win32: Correct the event array size in aio_poll(), Paolo Bonzini, 2022/11/06
- [PULL 05/12] Fix broken configure with -Wunused-parameter, Paolo Bonzini, 2022/11/06
- [PULL 06/12] meson: avoid unused arguments of main() in compiler tests,
Paolo Bonzini <=
- [PULL 07/12] Add missing include statement for global xml_builtin, Paolo Bonzini, 2022/11/06
- [PULL 08/12] module: removed unused function argument "mayfail", Paolo Bonzini, 2022/11/06
- [PULL 09/12] module: rename module_load_one to module_load, Paolo Bonzini, 2022/11/06
- [PULL 10/12] module: add Error arguments to module_load and module_load_qom, Paolo Bonzini, 2022/11/06
- [PULL 11/12] dmg: warn when opening dmg images containing blocks of unknown type, Paolo Bonzini, 2022/11/06
- [PULL 12/12] accel: abort if we fail to load the accelerator plugin, Paolo Bonzini, 2022/11/06
- Re: [PULL 00/12] Misc bugfix patches (+ improved module errors) for QEMU 7.2, Stefan Hajnoczi, 2022/11/07