From: "Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Christian Schoenebeck" <qemu_oss@crudebyte.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Cameron Esfahani" <dirty@apple.com>,
"Roman Bolshakov" <r.bolshakov@yadro.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Akihiko Odaki" <akihiko.odaki@gmail.com>
Subject: [PULL 12/21] osdep: Avoid using Clang-specific __builtin_available()
Date: Tue, 15 Mar 2022 13:53:41 +0100 [thread overview]
Message-ID: <20220315125350.82452-13-philippe.mathieu.daude@gmail.com> (raw)
In-Reply-To: <20220315125350.82452-1-philippe.mathieu.daude@gmail.com>
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Remove the Clang specific __builtin_available() to allow building
with GCC, otherwise we get:
include/qemu/osdep.h: In function 'qemu_thread_jit_write':
include/qemu/osdep.h:787:9: warning: implicit declaration of function '__builtin_available'; did you mean '__builtin_scalbl'? [-Wimplicit-function-declaration]
787 | if (__builtin_available(macOS 11.0, *)) {
| ^~~~~~~~~~~~~~~~~~~
| __builtin_scalbl
include/qemu/osdep.h:787:9: warning: nested extern declaration of '__builtin_available' [-Wnested-externs]
include/qemu/osdep.h:787:29: error: 'macOS' undeclared (first use in this function)
787 | if (__builtin_available(macOS 11.0, *)) {
| ^~~~~
include/qemu/osdep.h:787:29: note: each undeclared identifier is reported only once for each function it appears in
include/qemu/osdep.h:787:34: error: expected ')' before numeric constant
787 | if (__builtin_available(macOS 11.0, *)) {
| ~ ^~~~~
| )
Beside, on macOS Catalina we get 2254 times:
include/qemu/osdep.h:780:5: warning: 'pthread_jit_write_protect_np' is only available on macOS 11.0 or newer [-Wunguarded-availability-new]
pthread_jit_write_protect_np(true);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fix by using a stricker toolchain version low range, replacing
MAC_OS_X_VERSION_MAX_ALLOWED by MAC_OS_X_VERSION_MIN_REQUIRED.
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Tested-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/qemu/osdep.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index c9ec7830c9..322103aadb 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -624,19 +624,15 @@ size_t qemu_get_host_physmem(void);
* for the current thread.
*/
#if defined(MAC_OS_VERSION_11_0) && \
- MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0
+ MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
static inline void qemu_thread_jit_execute(void)
{
- if (__builtin_available(macOS 11.0, *)) {
- pthread_jit_write_protect_np(true);
- }
+ pthread_jit_write_protect_np(true);
}
static inline void qemu_thread_jit_write(void)
{
- if (__builtin_available(macOS 11.0, *)) {
- pthread_jit_write_protect_np(false);
- }
+ pthread_jit_write_protect_np(false);
}
#else
static inline void qemu_thread_jit_write(void) {}
--
2.34.1
next prev parent reply other threads:[~2022-03-15 13:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 12:53 [PULL 00/21] Darwin patches for 2022-03-15 Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 01/21] configure: Allow passing extra Objective C compiler flags Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 02/21] tests/fp/berkeley-testfloat-3: Ignore ignored #pragma directives Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 03/21] hvf: Use standard CR0 and CR4 register definitions Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 04/21] hvf: Make hvf_get_segments() / hvf_put_segments() local Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 05/21] hvf: Remove deprecated hv_vcpu_flush() calls Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 06/21] block/file-posix: Remove a deprecation warning on macOS 12 Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 07/21] audio/coreaudio: " Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 08/21] audio/dbus: Fix building with modules on macOS Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 09/21] audio: Log context for audio bug Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 10/21] coreaudio: Always return 0 in handle_voice_change Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 11/21] audio: Rename coreaudio extension to use Objective-C compiler Philippe Mathieu-Daudé
2022-03-15 12:53 ` Philippe Mathieu-Daudé [this message]
2022-03-15 12:53 ` [PULL 13/21] meson: Resolve the entitlement.sh script once for good Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 14/21] meson: Log QEMU_CXXFLAGS content in summary Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 15/21] configure: Pass filtered QEMU_OBJCFLAGS to meson Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 16/21] ui/cocoa: Constify qkeycode translation arrays Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 17/21] ui/cocoa: add option to disable left-command forwarding to guest Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 18/21] ui/cocoa: release mouse when user switches away from QEMU window Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 19/21] ui/cocoa: capture all keys and combos when mouse is grabbed Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 20/21] ui/cocoa: add option to swap Option and Command Philippe Mathieu-Daudé
2022-03-15 12:53 ` [PULL 21/21] MAINTAINERS: Volunteer to maintain Darwin-based hosts support Philippe Mathieu-Daudé
2022-03-15 23:07 ` [PULL 00/21] Darwin patches for 2022-03-15 Peter Maydell
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=20220315125350.82452-13-philippe.mathieu.daude@gmail.com \
--to=philippe.mathieu.daude@gmail.com \
--cc=akihiko.odaki@gmail.com \
--cc=dirty@apple.com \
--cc=f4bug@amsat.org \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu_oss@crudebyte.com \
--cc=r.bolshakov@yadro.com \
/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).