From: Thomas Huth <thuth@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, ehabkost@redhat.com
Subject: Re: [PATCH v2 8/8] configure: Remove probe for _Static_assert
Date: Tue, 15 Jun 2021 09:58:34 +0200 [thread overview]
Message-ID: <102db642-5006-9362-f400-e138402f27eb@redhat.com> (raw)
In-Reply-To: <20210614233143.1221879-9-richard.henderson@linaro.org>
On 15/06/2021 01.31, Richard Henderson wrote:
> _Static_assert is part of C11, which is now required.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> configure | 18 ------------------
> include/qemu/compiler.h | 11 -----------
> 2 files changed, 29 deletions(-)
>
> diff --git a/configure b/configure
> index 0489864667..debd50c085 100755
> --- a/configure
> +++ b/configure
> @@ -5090,20 +5090,6 @@ if compile_prog "" "" ; then
> have_sysmacros=yes
> fi
>
> -##########################################
> -# check for _Static_assert()
> -
> -have_static_assert=no
> -cat > $TMPC << EOF
> -_Static_assert(1, "success");
> -int main(void) {
> - return 0;
> -}
> -EOF
> -if compile_prog "" "" ; then
> - have_static_assert=yes
> -fi
> -
> ##########################################
> # check for utmpx.h, it is missing e.g. on OpenBSD
>
> @@ -6035,10 +6021,6 @@ if test "$have_sysmacros" = "yes" ; then
> echo "CONFIG_SYSMACROS=y" >> $config_host_mak
> fi
>
> -if test "$have_static_assert" = "yes" ; then
> - echo "CONFIG_STATIC_ASSERT=y" >> $config_host_mak
> -fi
> -
> if test "$have_utmpx" = "yes" ; then
> echo "HAVE_UTMPX=y" >> $config_host_mak
> fi
> diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h
> index 5766d61589..3baa5e3790 100644
> --- a/include/qemu/compiler.h
> +++ b/include/qemu/compiler.h
> @@ -72,18 +72,7 @@
> int:(x) ? -1 : 1; \
> }
>
> -/* QEMU_BUILD_BUG_MSG() emits the message given if _Static_assert is
> - * supported; otherwise, it will be omitted from the compiler error
> - * message (but as it remains present in the source code, it can still
> - * be useful when debugging). */
> -#if defined(CONFIG_STATIC_ASSERT)
> #define QEMU_BUILD_BUG_MSG(x, msg) _Static_assert(!(x), msg)
> -#elif defined(__COUNTER__)
> -#define QEMU_BUILD_BUG_MSG(x, msg) typedef QEMU_BUILD_BUG_ON_STRUCT(x) \
> - glue(qemu_build_bug_on__, __COUNTER__) __attribute__((unused))
> -#else
> -#define QEMU_BUILD_BUG_MSG(x, msg)
> -#endif
>
> #define QEMU_BUILD_BUG_ON(x) QEMU_BUILD_BUG_MSG(x, "not expecting: " #x)
Reviewed-by: Thomas Huth <thuth@redhat.com>
next prev parent reply other threads:[~2021-06-15 7:59 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 23:31 [PATCH v2 0/8] configure: Change to -std=gnu11 Richard Henderson
2021-06-14 23:31 ` [PATCH v2 1/8] configure: Use -std=gnu11 Richard Henderson
2021-06-15 7:43 ` Thomas Huth
2021-06-15 10:10 ` Alex Bennée
2021-06-15 13:49 ` Philippe Mathieu-Daudé
2021-06-14 23:31 ` [PATCH v2 2/8] softfloat: Use _Generic instead of QEMU_GENERIC Richard Henderson
2021-06-15 7:48 ` Thomas Huth
2021-06-15 10:18 ` Alex Bennée
2021-06-14 23:31 ` [PATCH v2 3/8] util: Use real functions for thread-posix QemuRecMutex Richard Henderson
2021-06-15 7:50 ` Thomas Huth
2021-06-15 10:54 ` Alex Bennée
2021-06-14 23:31 ` [PATCH v2 4/8] util: Pass file+line to qemu_rec_mutex_unlock_impl Richard Henderson
2021-06-15 10:56 ` Alex Bennée
2021-06-15 13:51 ` Philippe Mathieu-Daudé
2021-06-14 23:31 ` [PATCH v2 5/8] util: Use unique type for QemuRecMutex in thread-posix.h Richard Henderson
2021-06-15 7:56 ` Thomas Huth
2021-06-15 10:57 ` Alex Bennée
2021-06-14 23:31 ` [PATCH v2 6/8] include/qemu/lockable: Use _Generic instead of QEMU_GENERIC Richard Henderson
2021-06-15 11:25 ` Alex Bennée
2021-06-14 23:31 ` [PATCH v2 7/8] qemu/compiler: Remove QEMU_GENERIC Richard Henderson
2021-06-15 11:26 ` Alex Bennée
2021-06-14 23:31 ` [PATCH v2 8/8] configure: Remove probe for _Static_assert Richard Henderson
2021-06-15 7:58 ` Thomas Huth [this message]
2021-06-15 10:29 ` Alex Bennée
2021-06-14 23:42 ` [PATCH v2 0/8] configure: Change to -std=gnu11 no-reply
2021-06-16 13:04 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=102db642-5006-9362-f400-e138402f27eb@redhat.com \
--to=thuth@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).