Commit 5c49b363dc1094b64fe5d1ea54194fe937deccaf
1 parent
4872aa13
Restore ARM signal handler compilation on glibc < 2.5 (Blue Swirl).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4641 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
4 additions
and
0 deletions
cpu-exec.c
| @@ -1320,7 +1320,11 @@ int cpu_signal_handler(int host_signum, void *pinfo, | @@ -1320,7 +1320,11 @@ int cpu_signal_handler(int host_signum, void *pinfo, | ||
| 1320 | unsigned long pc; | 1320 | unsigned long pc; |
| 1321 | int is_write; | 1321 | int is_write; |
| 1322 | 1322 | ||
| 1323 | +#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ =< 3)) | ||
| 1324 | + pc = uc->uc_mcontext.gregs[R15]; | ||
| 1325 | +#else | ||
| 1323 | pc = uc->uc_mcontext.arm_pc; | 1326 | pc = uc->uc_mcontext.arm_pc; |
| 1327 | +#endif | ||
| 1324 | /* XXX: compute is_write */ | 1328 | /* XXX: compute is_write */ |
| 1325 | is_write = 0; | 1329 | is_write = 0; |
| 1326 | return handle_cpu_signal(pc, (unsigned long)info->si_addr, | 1330 | return handle_cpu_signal(pc, (unsigned long)info->si_addr, |