* [Qemu-trivial] [PATCH 2/4] fix build error on ARM due to wrong glibc check
@ 2012-12-10 6:15 ` John Spencer
0 siblings, 0 replies; 4+ messages in thread
From: John Spencer @ 2012-12-10 6:15 UTC (permalink / raw)
To: qemu-trivial; +Cc: qemu-devel
[-- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH 2/4] fix build error on ARM due to wrong glibc check
@ 2012-12-10 6:15 ` John Spencer
0 siblings, 0 replies; 4+ messages in thread
From: John Spencer @ 2012-12-10 6:15 UTC (permalink / raw)
To: qemu-trivial; +Cc: qemu-devel
[-- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-trivial] [PATCH 2/4] fix build error on ARM due to wrong glibc check
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 ` John Spencer
2012-12-18 16:23 ` Stefan Hajnoczi
0 siblings, 1 reply; 4+ messages in thread
From: John Spencer @ 2012-12-10 6:59 UTC (permalink / raw)
To: qemu-trivial; +Cc: qemu-devel
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-trivial] [PATCH 2/4] fix build error on ARM due to wrong glibc check
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
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2012-12-18 16:23 UTC (permalink / raw)
To: John Spencer; +Cc: qemu-trivial, qemu-devel
On Mon, Dec 10, 2012 at 07:59:44AM +0100, John Spencer wrote:
> 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(-)
Thanks, applied Patch 2 to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches
Stefan
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-18 16:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-10 6:15 [Qemu-trivial] [PATCH 2/4] fix build error on ARM due to wrong glibc check John Spencer
2012-12-10 6:15 ` [Qemu-devel] " 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
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.