commit bc2e88a85d5fd3e59c041a667283378c1503a16c
author Dimitry Ivanov <dimitry@google.com> Wed Dec 16 19:02:04 2015 +0000
committer Dimitry Ivanov <dimitry@google.com> Wed Dec 16 19:02:04 2015 +0000
tree 4c2f4295e7c36a46c22a0984366ce8e12c5be93f
parent 23af25b747b5e7b0ca513a87b32f1f6a3cb99698

Revert "Revert "Remove remaining ndk_cruft from LP64 platforms""

This reverts commit 23af25b747b5e7b0ca513a87b32f1f6a3cb99698.

Bug: http://b/26164862
Change-Id: I201bf49530f33f8ba6a1a35b79723afb9e84c7a5

libc/libc.arm.map

diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index d6f5407..1a666f4 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -383,7 +383,7 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    endpwent; # arm x86 mips nobrillo
     endservent;
     endutent;
     environ;
@@ -1447,8 +1447,8 @@
     _Unwind_VRS_Set; # arm
     atexit; # arm
     dlmalloc; # arm x86 mips nobrillo
-    dlmalloc_inspect_all; # arm arm64 x86 x86_64 mips mips64 nobrillo
-    dlmalloc_trim; # arm arm64 x86 x86_64 mips mips64 nobrillo
+    dlmalloc_inspect_all; # arm x86 mips nobrillo
+    dlmalloc_trim; # arm x86 mips nobrillo
     dlmalloc_usable_size; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
     SHA1Final; # arm x86 mips