|
1 | 1 | --- a/src/runtime/os_linux32.go |
2 | 2 | +++ b/src/runtime/os_linux32.go |
3 | | -@@ -21,7 +21,7 @@ |
4 | | - |
| 3 | +@@ -24,7 +24,7 @@ |
| 4 | + |
5 | 5 | //go:nosplit |
6 | 6 | func futex(addr unsafe.Pointer, op int32, val uint32, ts *timespec, addr2 unsafe.Pointer, val3 uint32) int32 { |
7 | | -- if !isFutexTime32bitOnly.Load() { |
8 | | -+ if GOOS != "android" && !isFutexTime32bitOnly.Load() { |
9 | | - ret := futex_time64(addr, op, val, ts, addr2, val3) |
10 | | - // futex_time64 is only supported on Linux 5.0+ |
11 | | - if ret != -_ENOSYS { |
12 | | -@@ -49,7 +49,7 @@ |
13 | | - |
| 7 | +- if use64bitsTimeOn32bits { |
| 8 | ++ if GOOS != "android" && use64bitsTimeOn32bits { |
| 9 | + return futex_time64(addr, op, val, ts, addr2, val3) |
| 10 | + } |
| 11 | + // Downgrade ts. |
| 12 | +@@ -45,7 +45,7 @@ |
| 13 | + |
14 | 14 | //go:nosplit |
15 | 15 | func timer_settime(timerid int32, flags int32, new, old *itimerspec) int32 { |
16 | | -- if !isSetTime32bitOnly.Load() { |
17 | | -+ if GOOS != "android" && !isSetTime32bitOnly.Load() { |
18 | | - ret := timer_settime64(timerid, flags, new, old) |
19 | | - // timer_settime64 is only supported on Linux 5.0+ |
20 | | - if ret != -_ENOSYS { |
| 16 | +- if use64bitsTimeOn32bits { |
| 17 | ++ if GOOS != "android" && use64bitsTimeOn32bits { |
| 18 | + return timer_settime64(timerid, flags, new, old) |
| 19 | + } |
| 20 | + |
0 commit comments