diff --git a/configure b/configure index 101511d906b4657a8956c3f5e9f1061280aa33c2..8c3db36a208ddca627a19f7afc38e771f28e2887 100755 --- a/configure +++ b/configure @@ -15687,6 +15687,7 @@ esac + for ac_func in \ @@ -15746,6 +15747,7 @@ for ac_func in \ strncasecmp \ strtold \ tcgetattr \ + thr_kill2 \ timegm \ usleep \ vsnprintf \ diff --git a/configure.ac b/configure.ac index 6b90cd2552a095b88a91a65cd9e0cc2e9c89fff6..64be416106e4ff77a699869085bdc8eabb4f4ba6 100644 --- a/configure.ac +++ b/configure.ac @@ -1287,6 +1287,7 @@ AC_CHECK_FUNCS(\ strncasecmp \ strtold \ tcgetattr \ + thr_kill2 \ timegm \ usleep \ vsnprintf \ diff --git a/include/config.h.in b/include/config.h.in index 0c4935c64af111e3988238f8a16de6ab0f52b757..df65adb55c356c1072a467a9694d5f395333deaa 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -849,6 +849,9 @@ /* Define to 1 if you have the <termios.h> header file. */ #undef HAVE_TERMIOS_H +/* Define to 1 if you have the `thr_kill2' function. */ +#undef HAVE_THR_KILL2 + /* Define to 1 if you have the `timegm' function. */ #undef HAVE_TIMEGM diff --git a/server/ptrace.c b/server/ptrace.c index f1a9afb7c3dc2f3e08910f2102c7b97ec00f2f7b..343e38e54d75422f9dbff816c483a12cb37253e5 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -35,6 +35,10 @@ #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif +#ifdef HAVE_SYS_THR_H +# include <sys/ucontext.h> +# include <sys/thr.h> +#endif #include <unistd.h> #include "ntstatus.h" @@ -206,9 +210,8 @@ static int wait4_thread( struct thread *thread, int signal ) /* send a signal to a specific thread */ static inline int tkill( int tgid, int pid, int sig ) { - int ret = -ENOSYS; - #ifdef __linux__ + int ret = -ENOSYS; # ifdef __i386__ __asm__( "pushl %%ebx\n\t" "movl %2,%%ebx\n\t" @@ -227,11 +230,15 @@ static inline int tkill( int tgid, int pid, int sig ) __asm__( "syscall" : "=a" (ret) : "0" (200) /*SYS_tkill*/, "D" (pid), "S" (sig) ); # endif -#endif /* __linux__ */ - if (ret >= 0) return ret; errno = -ret; return -1; +#elif defined(__FreeBSD__) && defined(HAVE_THR_KILL2) + return thr_kill2( tgid, pid, sig ); +#else + errno = ENOSYS; + return -1; +#endif } /* initialize the process tracing mechanism */