commit 15eaaddef9fffda1209e9cc576b47b0f6e0cb379
author Christopher Ferris <cferris@google.com> Wed May 31 20:07:29 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 31 20:07:31 2017 +0000
tree 5b5f2c1a7b75b5ce68410105cb965385351aaea2
parent 8f7a987cd0204706b8a7a2a30171746493b42ffd
parent 488eb8b7d2fb7a51c90664ae0baea75b7280cddd

Merge "Move mallopt to correct section."

libc/libc.arm.map

diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index b32f769..a4212dd 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -1279,6 +1279,7 @@
     getsubopt; # introduced=26
     hasmntopt; # introduced=26
     lutimes; # introduced=26
+    mallopt; # introduced=26
     mblen; # introduced=26
     msgctl; # introduced=26
     msgget; # introduced=26
@@ -1553,5 +1554,4 @@
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;

libc/libc.arm64.map

diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index afcf8bb..bf0341a 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -1201,6 +1201,7 @@
     getsubopt; # introduced=26
     hasmntopt; # introduced=26
     lutimes; # introduced=26
+    mallopt; # introduced=26
     mblen; # introduced=26
     msgctl; # introduced=26
     msgget; # introduced=26
@@ -1270,5 +1271,4 @@
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;

libc/libc.map.txt

diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index c453a38..c271a57 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -1304,6 +1304,7 @@
     getsubopt; # introduced=26
     hasmntopt; # introduced=26
     lutimes; # introduced=26
+    mallopt; # introduced=26
     mblen; # introduced=26
     msgctl; # introduced=26
     msgget; # introduced=26
@@ -1579,5 +1580,4 @@
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;

libc/libc.mips.map

diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index a472214..214c7f5 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -1263,6 +1263,7 @@
     getsubopt; # introduced=26
     hasmntopt; # introduced=26
     lutimes; # introduced=26
+    mallopt; # introduced=26
     mblen; # introduced=26
     msgctl; # introduced=26
     msgget; # introduced=26
@@ -1394,5 +1395,4 @@
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;

libc/libc.mips64.map

diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index afcf8bb..bf0341a 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -1201,6 +1201,7 @@
     getsubopt; # introduced=26
     hasmntopt; # introduced=26
     lutimes; # introduced=26
+    mallopt; # introduced=26
     mblen; # introduced=26
     msgctl; # introduced=26
     msgget; # introduced=26
@@ -1270,5 +1271,4 @@
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;

libc/libc.x86.map

diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 27a597f..145b64e 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -1261,6 +1261,7 @@
     getsubopt; # introduced=26
     hasmntopt; # introduced=26
     lutimes; # introduced=26
+    mallopt; # introduced=26
     mblen; # introduced=26
     msgctl; # introduced=26
     msgget; # introduced=26
@@ -1393,5 +1394,4 @@
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;

libc/libc.x86_64.map

diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index afcf8bb..bf0341a 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -1201,6 +1201,7 @@
     getsubopt; # introduced=26
     hasmntopt; # introduced=26
     lutimes; # introduced=26
+    mallopt; # introduced=26
     mblen; # introduced=26
     msgctl; # introduced=26
     msgget; # introduced=26
@@ -1270,5 +1271,4 @@
     malloc_disable;
     malloc_enable;
     malloc_iterate;
-    mallopt;
 } LIBC_O;