From: John Spencer <maillist-qemu@barfooze.de>
To: qemu-trivial@nongnu.org
Cc: qemu-devel@nongnu.org
Subject: [Qemu-trivial] [PATCH 2/4] fix build error on ARM due to wrong glibc check
Date: Mon, 10 Dec 2012 07:15:00 +0100 [thread overview]
Message-ID: <50C57DE4.5050304@barfooze.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0002-fix-build-error-on-ARM-due-to-wrong-glibc-check.patch --]
[-- Type: text/x-patch, Size: 1018 bytes --]
From ae02bfc600bf8c4c8502e70bdf8dfcd332ebef02 Mon Sep 17 00:00:00 2001
From: John Spencer <maillist-qemu@barfooze.de>
Date: Mon, 10 Dec 2012 06:54:03 +0100
Subject: [PATCH 2/4] fix build error on ARM due to wrong glibc check
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
WARNING: multiple messages have this Message-ID (diff)
From: John Spencer <maillist-qemu@barfooze.de>
To: qemu-trivial@nongnu.org
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 2/4] fix build error on ARM due to wrong glibc check
Date: Mon, 10 Dec 2012 07:15:00 +0100 [thread overview]
Message-ID: <50C57DE4.5050304@barfooze.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0002-fix-build-error-on-ARM-due-to-wrong-glibc-check.patch --]
[-- Type: text/x-patch, Size: 1019 bytes --]
>From ae02bfc600bf8c4c8502e70bdf8dfcd332ebef02 Mon Sep 17 00:00:00 2001
From: John Spencer <maillist-qemu@barfooze.de>
Date: Mon, 10 Dec 2012 06:54:03 +0100
Subject: [PATCH 2/4] fix build error on ARM due to wrong glibc check
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 reply other threads:[~2012-12-10 6:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 6:15 John Spencer [this message]
2012-12-10 6:15 ` [Qemu-devel] [PATCH 2/4] fix build error on ARM due to wrong glibc check John Spencer
-- strict thread matches above, loose matches on Subject: below --
2012-12-10 6:59 [Qemu-trivial] [PATCH 1/4] fix implicit declaration of syscall() in linux-user/mmap.c John Spencer
2012-12-10 6:59 ` [Qemu-trivial] [PATCH 2/4] fix build error on ARM due to wrong glibc check John Spencer
2012-12-18 16:23 ` Stefan Hajnoczi
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=50C57DE4.5050304@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.