diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-18 15:41:43 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-18 15:41:43 -0600 |
| commit | 914606d26e654d4c01bd5186f4d05e3fd445e219 (patch) | |
| tree | c7f26d5e4b520b623e91c1b7ceffa6e4800bcc8e /user-exec.c | |
| parent | 5455a474d92e345df83212fd1b2f59d4a5d46ca9 (diff) | |
| parent | 779ab5e3ddb9ad903f9a0ec21e148ed7bfd2d255 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
configure: Earlier pkg-config probe
vmmouse_reset(): remove minimal code duplication
linux-user/syscall.c: remove wrong forward decl of setgroups()
fix build error on ARM due to wrong glibc check
gitignore: Add virtfs-proxy-helper
arm_gic: Add cpu nr to Raised IRQ message
zynq_slcr: Compile time warning fixes.
pflash_cfi0x: Send debug messages to stderr
pflash_cfi01: qemu_log_mask "unimplemented" msg
net, hub: fix the indent in the comments
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'user-exec.c')
| -rw-r--r-- | user-exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user-exec.c b/user-exec.c index 1185cb03c8..5863b9f362 100644 --- a/user-exec.c +++ b/user-exec.c @@ -436,7 +436,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; |