diff options
| author | Henrik Nord <[email protected]> | 2014-03-21 16:39:02 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2014-03-21 16:39:05 +0100 |
| commit | a4030a89eb9a22d250dba2793f274f8731126ea8 (patch) | |
| tree | 620592b3560f98be67f71f70fd5596cc110ecd70 /erts/lib_src/pthread | |
| parent | c9da6c2f06efa410462299a20e10206843082ac8 (diff) | |
| parent | f43a1dc55d42de3097f75ca65baead9a2ff05c78 (diff) | |
| download | otp-a4030a89eb9a22d250dba2793f274f8731126ea8.tar.gz otp-a4030a89eb9a22d250dba2793f274f8731126ea8.tar.bz2 otp-a4030a89eb9a22d250dba2793f274f8731126ea8.zip | |
Merge branch 'fogfish/embedded-arm-android'
* fogfish/embedded-arm-android:
Raspberry PI / Android a minimal cross-compile configuration
OTP-11805
Diffstat (limited to 'erts/lib_src/pthread')
| -rw-r--r-- | erts/lib_src/pthread/ethread.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c index 7f27b5f29c..79784c5b84 100644 --- a/erts/lib_src/pthread/ethread.c +++ b/erts/lib_src/pthread/ethread.c @@ -541,7 +541,11 @@ int ethr_sigmask(int how, const sigset_t *set, sigset_t *oset) return EINVAL; } #endif - return pthread_sigmask(how, set, oset); +#if defined(__ANDROID__) + return sigprocmask(how, set, oset); +#else + return pthread_sigmask(how, set, oset); +#endif } int ethr_sigwait(const sigset_t *set, int *sig) |