From: John Spencer <maillist-qemu@barfooze.de>
To: qemu-trivial@nongnu.org
Cc: qemu-devel@nongnu.org, John Spencer <maillist-qemu@barfooze.de>
Subject: [Qemu-devel] [PATCH 2/4] fix build error on ARM due to wrong glibc check
Date: Mon, 10 Dec 2012 07:59:44 +0100 [thread overview]
Message-ID: <1355122786-29243-2-git-send-email-maillist-qemu@barfooze.de> (raw)
In-Reply-To: <1355122786-29243-1-git-send-email-maillist-qemu@barfooze.de>
the test for glibc < 2 "succeeds" wrongly for any non-glibc C library,
and breaks the build on musl libc.
we must first test if __GLIBC__ is defined at all, before using it
unconditionally.
Signed-off-by: John Spencer <maillist-qemu@barfooze.de>
---
user-exec.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/user-exec.c b/user-exec.c
index ef9b172..cccc145 100644
--- a/user-exec.c
+++ b/user-exec.c
@@ -442,7 +442,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
unsigned long pc;
int is_write;
-#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
+#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
pc = uc->uc_mcontext.gregs[R15];
#else
pc = uc->uc_mcontext.arm_pc;
--
1.7.3.4
next prev parent reply other threads:[~2012-12-10 7:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 6:59 [Qemu-devel] [PATCH 1/4] fix implicit declaration of syscall() in linux-user/mmap.c John Spencer
2012-12-10 6:59 ` John Spencer [this message]
2012-12-10 17:46 ` [Qemu-devel] [PATCH 2/4] fix build error on ARM due to wrong glibc check Stefan Weil
2012-12-18 16:23 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
2012-12-10 6:59 ` [Qemu-devel] [PATCH 3/4] fix implicit declaration of syscall() in linux-user/syscall.c John Spencer
2012-12-10 17:49 ` Stefan Weil
2012-12-11 1:23 ` John Spencer
2012-12-11 6:07 ` Stefan Weil
2012-12-10 6:59 ` [Qemu-devel] [PATCH 4/4] linux-user/syscall.c: remove wrong forward decl of setgroups() John Spencer
2012-12-10 17:47 ` Stefan Weil
2012-12-18 16:23 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
2012-12-10 17:44 ` [Qemu-devel] [PATCH 1/4] fix implicit declaration of syscall() in linux-user/mmap.c Stefan Weil
-- strict thread matches above, loose matches on Subject: below --
2012-12-10 6:15 [Qemu-devel] [PATCH 2/4] fix build error on ARM due to wrong glibc check John Spencer
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=1355122786-29243-2-git-send-email-maillist-qemu@barfooze.de \
--to=maillist-qemu@barfooze.de \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.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).