commit 23af25b747b5e7b0ca513a87b32f1f6a3cb99698
author Dimitry Ivanov <dimitry@google.com> Tue Dec 15 01:34:14 2015 +0000
committer Dimitry Ivanov <dimitry@google.com> Tue Dec 15 01:34:14 2015 +0000
tree 5d1a2a01cc4566ea0a6ea7941147924276b186bd
parent b1d0a2ae7790f882d8f1ab24d7ef15e2b90c8ca2

Revert "Remove remaining ndk_cruft from LP64 platforms"

This reverts commit b1d0a2ae7790f882d8f1ab24d7ef15e2b90c8ca2.

Change-Id: I1da06be0b78a4f2a4cad7e4a19a3ee755f55a813

libc/libc.map.txt

diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 9eb8d01..74f7b82 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -387,7 +387,7 @@
     dup3;
     duplocale;
     endmntent;
-    endpwent; # arm x86 mips nobrillo
+    endpwent; # arm arm64 x86 x86_64 mips mips64 nobrillo
     endservent;
     endutent;
     environ;
@@ -1474,8 +1474,8 @@
     _Unwind_VRS_Set; # arm
     atexit; # arm
     dlmalloc; # arm x86 mips nobrillo
-    dlmalloc_inspect_all; # arm x86 mips nobrillo
-    dlmalloc_trim; # 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_usable_size; # arm x86 mips nobrillo
     gMallocLeakZygoteChild;
     SHA1Final; # arm x86 mips