Commit d2bfb39a authored by bellard's avatar bellard
Browse files

use the kernel sigaction syscall to avoid relying on glibc one


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1044 c046a42c-6fe2-441c-8c8c-71466251a162
parent 3611a29c
......@@ -143,6 +143,22 @@ void *shmat(int shmid, const void *shmaddr, int shmflg)
return ptr;
}
/****************************************************************/
/* sigaction bypassing the threads */
static int kernel_sigaction(int signum, const struct qemu_sigaction *act,
struct qemu_sigaction *oldact,
int sigsetsize)
{
QEMU_SYSCALL4(rt_sigaction, signum, act, oldact, sigsetsize);
}
int qemu_sigaction(int signum, const struct qemu_sigaction *act,
struct qemu_sigaction *oldact)
{
return kernel_sigaction(signum, act, oldact, 8);
}
/****************************************************************/
/* memory allocation */
......
......@@ -22,6 +22,29 @@ void *get_mmap_addr(unsigned long size);
extern void __longjmp(jmp_buf env, int val);
#define longjmp __longjmp
#include <signal.h>
/* NOTE: it works only because the glibc sigset_t is >= kernel sigset_t */
struct qemu_sigaction {
union {
void (*_sa_handler)(int);
void (*_sa_sigaction)(int, struct siginfo *, void *);
} _u;
unsigned long sa_flags;
void (*sa_restorer)(void);
sigset_t sa_mask; /* mask last for extensibility */
};
int qemu_sigaction(int signum, const struct qemu_sigaction *act,
struct qemu_sigaction *oldact);
#undef sigaction
#undef sa_handler
#undef sa_sigaction
#define sigaction qemu_sigaction
#define sa_handler _u._sa_handler
#define sa_sigaction _u._sa_sigaction
#endif
#endif
......@@ -68,17 +68,6 @@
#ifdef __APPLE__
#include <SDL/SDL.h>
#endif
#if defined(__linux__)
/* SDL use the pthreads and they modify sigaction. We don't
want that. */
#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
extern void __libc_sigaction();
#define sigaction(sig, act, oact) __libc_sigaction(sig, act, oact)
#else
extern void __sigaction();
#define sigaction(sig, act, oact) __sigaction(sig, act, oact)
#endif
#endif /* __linux__ */
#endif /* CONFIG_SDL */
#include "disas.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment