diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-02-04 12:18:36 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-02-04 12:18:36 +0000 |
| commit | cb437e48ab7ddd9b85843beb524904ee4b565721 (patch) | |
| tree | 56b81401aaec347d689102972d028010fd35e8ba /linux-user/signal.c | |
| parent | 2944e4ece235c74dcce3aa11c456f3645ae594fc (diff) | |
| parent | f78b0f05414f911d36afcd52f2330574d5a21952 (diff) | |
| download | focaccia-qemu-cb437e48ab7ddd9b85843beb524904ee4b565721.tar.gz focaccia-qemu-cb437e48ab7ddd9b85843beb524904ee4b565721.zip | |
Merge branch 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio/qemu
* 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio/qemu: linux-user: Fix sa_flags byte swaps for mips linux-user: Define TARGET_QEMU_ESIGRETURN for mips64 linux-user: Define TARGET_QEMU_ESIGRETURN for mipsn32 linux-user: Add default configs for mips64[el] linux-user: Add default-configs for mipsn32[el] linux-user: Implement *listxattr syscalls linux-user/syscall.c: Implement f and l versions of set/get/removexattr linux-user: Allow NULL value pointer in setxattr and getxattr linux-user: fix wait* syscall status returns linux-user/strace.c: Correct errno printing for mmap etc linux-user: fix QEMU_STRACE=1 segfault linux-user: add SO_PEERCRED support for getsockopt linux-user/main.c: Add option to user-mode emulation so that user can specify log file name linux-user: fake /proc/self/auxv linux-user: fake /proc/self/stat linux-user: fake /proc/self/maps linux-user: add open() hijack infrastructure linux-user: save auxv length linux-user: stack_base is now mandatory on all targets
Diffstat (limited to 'linux-user/signal.c')
| -rw-r--r-- | linux-user/signal.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux-user/signal.c b/linux-user/signal.c index ded12caa18..79a39dcd7f 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -587,7 +587,11 @@ int do_sigaction(int sig, const struct target_sigaction *act, #endif if (oact) { oact->_sa_handler = tswapal(k->_sa_handler); +#if defined(TARGET_MIPS) || defined (TARGET_ALPHA) + oact->sa_flags = bswap32(k->sa_flags); +#else oact->sa_flags = tswapal(k->sa_flags); +#endif #if !defined(TARGET_MIPS) oact->sa_restorer = tswapal(k->sa_restorer); #endif @@ -596,7 +600,11 @@ int do_sigaction(int sig, const struct target_sigaction *act, if (act) { /* FIXME: This is not threadsafe. */ k->_sa_handler = tswapal(act->_sa_handler); +#if defined(TARGET_MIPS) || defined (TARGET_ALPHA) + k->sa_flags = bswap32(act->sa_flags); +#else k->sa_flags = tswapal(act->sa_flags); +#endif #if !defined(TARGET_MIPS) k->sa_restorer = tswapal(act->sa_restorer); #endif |