[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/8] configure: Fix atomic64 test for --enable-werror on macOS
From: |
Thomas Huth |
Subject: |
[PULL 1/8] configure: Fix atomic64 test for --enable-werror on macOS |
Date: |
Tue, 1 Sep 2020 17:20:43 +0200 |
When using --enable-werror for the macOS builders in the Cirrus-CI,
the atomic64 test is currently failing, and config.log shows a bunch
of error messages like this:
config-temp/qemu-conf.c:6:7: error: implicit declaration of function
'__atomic_load_8' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
y = __atomic_load_8(&x, 0);
^
config-temp/qemu-conf.c:6:7: error: this function declaration is not a
prototype [-Werror,-Wstrict-prototypes]
Seems like these __atomic_*_8 functions are available in one of the
libraries there, so that the test links and passes there when not
using --enable-werror. But there does not seem to be a valid prototype
for them in any of the header files, so that the test fails when using
--enable-werror.
Fix it by using the "official" built-in functions instead (see e.g.
https://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html).
We are not using the *_8 variants in QEMU anyway.
Suggested-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200728074405.13118-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
configure | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 8dc981684b..59b7310e15 100755
--- a/configure
+++ b/configure
@@ -5780,11 +5780,11 @@ int main(void)
{
uint64_t x = 0, y = 0;
#ifdef __ATOMIC_RELAXED
- y = __atomic_load_8(&x, 0);
- __atomic_store_8(&x, y, 0);
- __atomic_compare_exchange_8(&x, &y, x, 0, 0, 0);
- __atomic_exchange_8(&x, y, 0);
- __atomic_fetch_add_8(&x, y, 0);
+ y = __atomic_load_n(&x, __ATOMIC_RELAXED);
+ __atomic_store_n(&x, y, __ATOMIC_RELAXED);
+ __atomic_compare_exchange_n(&x, &y, x, 0, __ATOMIC_RELAXED,
__ATOMIC_RELAXED);
+ __atomic_exchange_n(&x, y, __ATOMIC_RELAXED);
+ __atomic_fetch_add(&x, y, __ATOMIC_RELAXED);
#else
typedef char is_host64[sizeof(void *) >= sizeof(uint64_t) ? 1 : -1];
__sync_lock_test_and_set(&x, y);
--
2.18.2
- [PULL 0/8] Cirrus-CI improvements, and other CI-related fixes, m68k, Thomas Huth, 2020/09/01
- [PULL 3/8] cirrus.yml: Compile macOS with -Werror, Thomas Huth, 2020/09/01
- [PULL 2/8] cirrus.yml: Compile FreeBSD with -Werror, Thomas Huth, 2020/09/01
- [PULL 6/8] meson: fix keymaps without qemu-keymap, Thomas Huth, 2020/09/01
- [PULL 5/8] cirrus.yml: Split FreeBSD job into two parts, Thomas Huth, 2020/09/01
- [PULL 8/8] hw/m68k: QOMify the mcf5206 system integration module, Thomas Huth, 2020/09/01
- [PULL 1/8] configure: Fix atomic64 test for --enable-werror on macOS,
Thomas Huth <=
- [PULL 7/8] configure: Add system = 'linux' for meson when cross-compiling, Thomas Huth, 2020/09/01
- [PULL 4/8] cirrus.yml: Update the macOS jobs to Catalina, Thomas Huth, 2020/09/01
- Re: [PULL 0/8] Cirrus-CI improvements, and other CI-related fixes, m68k, Peter Maydell, 2020/09/02