From bba395492a0bb6ee72d0ad8e4d468e852392220e Mon Sep 17 00:00:00 2001
From: Dimitry Ivanov <dimitry@google.com>
Date: Thu, 21 Jan 2016 22:25:32 +0000
Subject: [PATCH] Revert "Temporary apply LIBC version to __pthread_gettid"

This reverts commit 0ef1d121b5e4845f4ef3b59ae9a1f99ceb531186.

Bug: http://b/26392296
Bug: http://b/26391427
Change-Id: I7bbb555de3a43813e7623ff6ad4e17874d283eca
---
 libc/bionic/ndk_cruft.cpp | 9 +--------
 libc/libc.arm.map         | 1 -
 libc/libc.map.txt         | 1 -
 libc/libc.mips.map        | 1 -
 libc/libc.x86.map         | 1 -
 5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index dfd0e68de..4bbb2c174 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -340,17 +340,10 @@ size_t dlmalloc_usable_size(void* ptr) {
 }
 
 // In L we added a public pthread_gettid_np, but some apps were using the private API.
-pid_t __pthread_gettid_libc(pthread_t t) {
+pid_t __pthread_gettid(pthread_t t) {
   return pthread_gettid_np(t);
 }
 
-pid_t __pthread_gettid_libc_private(pthread_t t) {
-  return pthread_gettid_np(t);
-}
-
-__asm__(".symver __pthread_gettid_libc,__pthread_gettid@LIBC");
-__asm__(".symver __pthread_gettid_libc_private,__pthread_gettid@@LIBC_PRIVATE");
-
 // Older versions of apportable used dlmalloc directly instead of malloc,
 // so export this compatibility shim that simply calls malloc.
 void* dlmalloc(size_t size) {
diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index 91cd84c01..90b1db3e9 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -122,7 +122,6 @@ LIBC {
     __pselect6; # arm x86 mips
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
-    __pthread_gettid; # arm x86 mips nobrillo
     __ptrace; # arm x86 mips
     __putlong;
     __putshort;
diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index ffdb86a31..928f10d2a 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -123,7 +123,6 @@ LIBC {
     __pselect6; # arm x86 mips
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
-    __pthread_gettid; # arm x86 mips nobrillo
     __ptrace; # arm x86 mips
     __putlong;
     __putshort;
diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 0120e02b5..04c76d4ec 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -120,7 +120,6 @@ LIBC {
     __pselect6; # arm x86 mips
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
-    __pthread_gettid; # arm x86 mips nobrillo
     __ptrace; # arm x86 mips
     __putlong;
     __putshort;
diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 5eca698de..bcabf71a2 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -120,7 +120,6 @@ LIBC {
     __pselect6; # arm x86 mips
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
-    __pthread_gettid; # arm x86 mips nobrillo
     __ptrace; # arm x86 mips
     __putlong;
     __putshort;