From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
qemu-block@nongnu.org
Subject: [PATCH v2 5/9] meson.build: Don't misdetect posix_memalign() on Windows
Date: Fri, 4 Mar 2022 11:21:22 +0000 [thread overview]
Message-ID: <20220304112126.2261039-6-peter.maydell@linaro.org> (raw)
In-Reply-To: <20220304112126.2261039-1-peter.maydell@linaro.org>
Currently we incorrectly think that posix_memalign() exists on
Windows. This is because of a combination of:
* the msys2/mingw toolchain/libc claim to have a
__builtin_posix_memalign when there isn't a builtin of that name
* meson will assume that if you have a __builtin_foo that
counts for has_function('foo')
Specifying a specific include file via prefix: causes meson to not
treat builtins as sufficient and actually look for the function
itself; see this meson pull request which added that as the official
way to get the right answer:
https://github.com/mesonbuild/meson/pull/1150
Currently this misdectection doesn't cause problems because we only
use CONFIG_POSIX_MEMALIGN in oslib-posix.c; however that will change
in a following commit.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220226180723.1706285-6-peter.maydell@linaro.org
---
meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index a5b63e62cdc..73fd17a0523 100644
--- a/meson.build
+++ b/meson.build
@@ -1619,7 +1619,9 @@ config_host_data.set('CONFIG_CLOCK_ADJTIME', cc.has_function('clock_adjtime'))
config_host_data.set('CONFIG_DUP3', cc.has_function('dup3'))
config_host_data.set('CONFIG_FALLOCATE', cc.has_function('fallocate'))
config_host_data.set('CONFIG_POSIX_FALLOCATE', cc.has_function('posix_fallocate'))
-config_host_data.set('CONFIG_POSIX_MEMALIGN', cc.has_function('posix_memalign'))
+# Note that we need to specify prefix: here to avoid incorrectly
+# thinking that Windows has posix_memalign()
+config_host_data.set('CONFIG_POSIX_MEMALIGN', cc.has_function('posix_memalign', prefix: '#include <stdlib.h>'))
config_host_data.set('CONFIG_PPOLL', cc.has_function('ppoll'))
config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include <sys/uio.h>'))
config_host_data.set('CONFIG_SEM_TIMEDWAIT', cc.has_function('sem_timedwait', dependencies: threads))
--
2.25.1
next prev parent reply other threads:[~2022-03-04 11:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 11:21 [PATCH v2 0/9] Cleanup of qemu_oom_check() and qemu_memalign() Peter Maydell
2022-03-04 11:21 ` [PATCH v2 1/9] hw/usb/redirect.c: Stop using qemu_oom_check() Peter Maydell
2022-03-04 11:21 ` [PATCH v2 2/9] util: Make qemu_oom_check() a static function Peter Maydell
2022-03-04 11:21 ` [PATCH v2 3/9] util: Unify implementations of qemu_memalign() Peter Maydell
2022-03-04 14:00 ` Philippe Mathieu-Daudé
2022-03-04 11:21 ` [PATCH v2 4/9] util: Return valid allocation for qemu_try_memalign() with zero size Peter Maydell
2022-03-04 13:58 ` Philippe Mathieu-Daudé
2022-03-04 20:18 ` Richard Henderson
2022-03-04 11:21 ` Peter Maydell [this message]
2022-03-05 0:48 ` [PATCH v2 5/9] meson.build: Don't misdetect posix_memalign() on Windows Philippe Mathieu-Daudé
2022-03-04 11:21 ` [PATCH v2 6/9] util: Share qemu_try_memalign() implementation between POSIX and Windows Peter Maydell
2022-03-04 14:02 ` Philippe Mathieu-Daudé
2022-03-04 20:20 ` Richard Henderson
2022-03-04 11:21 ` [PATCH v2 7/9] util: Use meson checks for valloc() and memalign() presence Peter Maydell
2022-03-04 11:21 ` [PATCH v2 8/9] util: Put qemu_vfree() in memalign.c Peter Maydell
2022-03-04 14:03 ` Philippe Mathieu-Daudé
2022-03-04 11:21 ` [PATCH v2 9/9] osdep: Move memalign-related functions to their own header 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=20220304112126.2261039-6-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--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).