Re: [PATCH] meson: avoid unused arguments of main() in compiler tests

[Stefan Weil via]

Am 03.11.22 um 18:21 schrieb Paolo Bonzini:

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 <pbonz...@redhat.com>
---

Reviewed-by: Stefan Weil <s...@weilnetz.de>

Thanks, Stefan

  meson.build | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 17834b3c3def..7beeac6b5194 100644
--- a/meson.build
+++ b/meson.build
@@ -2143,7 +2143,7 @@ config_host_data.set('CONFIG_SPLICE', 
cc.links(gnu_source_prefix + '''

    #include <sys/mman.h>
-  int main(int argc, char *argv[]) {
+  int main(void) {
      return mlockall(MCL_FUTURE);
    }'''))

  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']))

        __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())

@@ -2319,7 +2319,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())

config_host_data.set('HAVE_MLOCKALL', cc.links(gnu_source_prefix + ''' @@ -2188,7 +2188,7 @@ config_host_data.set('HAVE_FSXATTR', cc.links(''' @@ -2305,7 +2305,7 @@ config_host_data.set('CONFIG_AVX2_OPT', get_option('avx2') \ config_host_data.set('CONFIG_AVX512F_OPT', get_option('avx512f') \ have_pvrdma = get_option('pvrdma') \

OpenPGP_0xE08C21D5677450AD.asc
Description: OpenPGP public key

OpenPGP_signature
Description: OpenPGP digital signature