diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-20 21:02:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-20 21:02:47 +0000 |
| commit | ae1d4c6df9cc0dee1d1f172d1f71125dc943f35c (patch) | |
| tree | 2790b34ec1463ab80522a894227d40d4701bf253 /luni | |
| parent | bb684af352deca3c885f30dba8fa68f95f873c7c (diff) | |
| parent | b45d8a149cf5c85ceb84d8fae0194529a4514adb (diff) | |
| download | libcore-ae1d4c6df9cc0dee1d1f172d1f71125dc943f35c.zip libcore-ae1d4c6df9cc0dee1d1f172d1f71125dc943f35c.tar.gz libcore-ae1d4c6df9cc0dee1d1f172d1f71125dc943f35c.tar.bz2 | |
am b45d8a14: Merge "bionic has always had gettid."
* commit 'b45d8a149cf5c85ceb84d8fae0194529a4514adb':
bionic has always had gettid.
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/native/libcore_io_Posix.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/luni/src/main/native/libcore_io_Posix.cpp b/luni/src/main/native/libcore_io_Posix.cpp index e8e8efb..6808dd6 100644 --- a/luni/src/main/native/libcore_io_Posix.cpp +++ b/luni/src/main/native/libcore_io_Posix.cpp @@ -873,8 +873,9 @@ static jint Posix_gettid(JNIEnv* env __unused, jobject) { return 0; } return static_cast<jint>(owner); +#elif defined(__BIONIC__) + return gettid(); #else - // Neither bionic nor glibc exposes gettid(2). return syscall(__NR_gettid); #endif } |