diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-06-20 13:50:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-20 02:04:52 +0000 |
| commit | 3c447213baf828ebd01c45ad459552b3c9922c92 (patch) | |
| tree | 198ed6386925c6ff5c24faf686b836aa74082836 /gcc-4.8/libgomp/config/linux/futex.h | |
| parent | e1be674a8e345aaa025ad9f1d38bab4272301e1d (diff) | |
| parent | f190d6284359da8ae8694b2d2e14b01602a959ed (diff) | |
| download | toolchain_gcc-3c447213baf828ebd01c45ad459552b3c9922c92.tar.gz toolchain_gcc-3c447213baf828ebd01c45ad459552b3c9922c92.tar.bz2 toolchain_gcc-3c447213baf828ebd01c45ad459552b3c9922c92.zip | |
Merge "Merge GCC 4.8.3"
Diffstat (limited to 'gcc-4.8/libgomp/config/linux/futex.h')
| -rw-r--r-- | gcc-4.8/libgomp/config/linux/futex.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc-4.8/libgomp/config/linux/futex.h b/gcc-4.8/libgomp/config/linux/futex.h index 676b2dbb8..9dd8fe72f 100644 --- a/gcc-4.8/libgomp/config/linux/futex.h +++ b/gcc-4.8/libgomp/config/linux/futex.h @@ -45,8 +45,8 @@ static inline void futex_wait (int *addr, int val) { - long err = syscall (SYS_futex, addr, gomp_futex_wait, val, NULL); - if (__builtin_expect (err == -ENOSYS, 0)) + int err = syscall (SYS_futex, addr, gomp_futex_wait, val, NULL); + if (__builtin_expect (err < 0 && errno == ENOSYS, 0)) { gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG; gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG; @@ -57,8 +57,8 @@ futex_wait (int *addr, int val) static inline void futex_wake (int *addr, int count) { - long err = syscall (SYS_futex, addr, gomp_futex_wake, count); - if (__builtin_expect (err == -ENOSYS, 0)) + int err = syscall (SYS_futex, addr, gomp_futex_wake, count); + if (__builtin_expect (err < 0 && errno == ENOSYS, 0)) { gomp_futex_wait &= ~FUTEX_PRIVATE_FLAG; gomp_futex_wake &= ~FUTEX_PRIVATE_FLAG; |