diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-27 18:15:01 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-27 18:15:01 +0000 |
| commit | 127fe8643340c330cbc0a4194ea56e3d522dbb71 (patch) | |
| tree | 930e459d4e19d689ecfd3108f329c82606663e34 /include | |
| parent | 77a48a743f9e4cc7482568eb417c2b47b0e558cf (diff) | |
| parent | 41e1f0e2256e4c21bc5671ecb64191e776477c35 (diff) | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-270320-2' into staging
Testing updates:
- docker updates (various dependencies)
- travis updates (s390x KVM build)
- tweak qemu/atomic.h headers in event of clash
- test/vm updates (NetBSD -> 9.0, FreeBSD -> 12.1)
- disable MTTCG for mips64/mips64el
# gpg: Signature made Fri 27 Mar 2020 13:45:18 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-testing-270320-2:
.travis.yml: Add a KVM-only s390x job
tests/docker: Add libepoxy and libudev packages to the Fedora image
tests/docker: Use Python3 PyYAML in the Fedora image
tests/docker: Install gcrypt devel package in Debian image
tests/docker: Keep package list sorted
configure: disable MTTCG for MIPS guests
tests/vm: fix basevm config
tests/vm: update NetBSD to 9.0
tests/vm: update FreeBSD to 12.1
tests/vm: move vga setup
tests/vm: write raw console log
qemu/atomic.h: add #ifdef guards for stdatomic.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/atomic.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index f9cd24c899..ff72db5115 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -208,11 +208,14 @@ /* Provide shorter names for GCC atomic builtins, return old value */ #define atomic_fetch_inc(ptr) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST) #define atomic_fetch_dec(ptr) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST) + +#ifndef atomic_fetch_add #define atomic_fetch_add(ptr, n) __atomic_fetch_add(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_sub(ptr, n) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_and(ptr, n) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_or(ptr, n) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_xor(ptr, n) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST) +#endif #define atomic_inc_fetch(ptr) __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST) #define atomic_dec_fetch(ptr) __atomic_sub_fetch(ptr, 1, __ATOMIC_SEQ_CST) @@ -392,11 +395,14 @@ /* Provide shorter names for GCC atomic builtins. */ #define atomic_fetch_inc(ptr) __sync_fetch_and_add(ptr, 1) #define atomic_fetch_dec(ptr) __sync_fetch_and_add(ptr, -1) + +#ifndef atomic_fetch_add #define atomic_fetch_add(ptr, n) __sync_fetch_and_add(ptr, n) #define atomic_fetch_sub(ptr, n) __sync_fetch_and_sub(ptr, n) #define atomic_fetch_and(ptr, n) __sync_fetch_and_and(ptr, n) #define atomic_fetch_or(ptr, n) __sync_fetch_and_or(ptr, n) #define atomic_fetch_xor(ptr, n) __sync_fetch_and_xor(ptr, n) +#endif #define atomic_inc_fetch(ptr) __sync_add_and_fetch(ptr, 1) #define atomic_dec_fetch(ptr) __sync_add_and_fetch(ptr, -1) |