commit 1464f6d8d9d560ed57bd878b822b2611c821b8bd
author Elliott Hughes <enh@google.com> Wed Jan 06 19:02:19 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 06 19:02:19 2016 +0000
tree 3a82945b8b291fbd21223101fbdc7608bdb0b89e
parent 4664c14fa44746ddf41524999ad96d221409c32c
parent 76dfa6e351952e60893e236022df54a23a558b65

Merge "Remove mktime_tz."

libc/libc.arm.brillo.map

diff --git a/libc/libc.arm.brillo.map b/libc/libc.arm.brillo.map
index 6c6d9aa..f7033a0 100644
--- a/libc/libc.arm.brillo.map
+++ b/libc/libc.arm.brillo.map
@@ -1401,7 +1401,7 @@
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
     __truncdfsf2; # arm
-    __udivdi3; # arm x86 mips
+    __udivdi3; # arm mips
     __udivsi3; # arm
     __unorddf2; # arm
     __unordsf2; # arm

libc/libc.arm.map

diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index 8bc8033..a88c549 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -1413,7 +1413,7 @@
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
     __truncdfsf2; # arm
-    __udivdi3; # arm x86 mips
+    __udivdi3; # arm mips
     __udivsi3; # arm
     __unorddf2; # arm
     __unordsf2; # arm

libc/libc.map.txt

diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 90a0634..dba1b90 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -223,6 +223,7 @@
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
+    __udivdi3; # x86
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1454,7 +1455,7 @@
     __system_property_update; # arm64 x86_64 mips64
     __system_property_wait_any; # arm64 x86_64 mips64
     __truncdfsf2; # arm
-    __udivdi3; # arm x86 mips
+    __udivdi3; # arm mips
     __udivsi3; # arm
     __umoddi3; # x86 mips
     __unorddf2; # arm

libc/libc.mips.brillo.map

diff --git a/libc/libc.mips.brillo.map b/libc/libc.mips.brillo.map
index 3db3197..e3b5a5e 100644
--- a/libc/libc.mips.brillo.map
+++ b/libc/libc.mips.brillo.map
@@ -1263,7 +1263,7 @@
     __swbuf; # arm x86 mips
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
-    __udivdi3; # arm x86 mips
+    __udivdi3; # arm mips
     __umoddi3; # x86 mips
     _fwalk; # arm x86 mips
     free_malloc_leak_info;

libc/libc.mips.map

diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 9b50664..4d2f826 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -1275,7 +1275,7 @@
     __swbuf; # arm x86 mips
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
-    __udivdi3; # arm x86 mips
+    __udivdi3; # arm mips
     __umoddi3; # x86 mips
     __wait4; # arm x86 mips nobrillo
     _fwalk; # arm x86 mips

libc/libc.x86.brillo.map

diff --git a/libc/libc.x86.brillo.map b/libc/libc.x86.brillo.map
index b82f989..637ad06 100644
--- a/libc/libc.x86.brillo.map
+++ b/libc/libc.x86.brillo.map
@@ -205,6 +205,7 @@
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
+    __udivdi3; # x86
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1262,7 +1263,6 @@
     __swbuf; # arm x86 mips
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
-    __udivdi3; # arm x86 mips
     __umoddi3; # x86 mips
     _fwalk; # arm x86 mips
     free_malloc_leak_info;

libc/libc.x86.map

diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 24a5f70..76bf9ea 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -206,6 +206,7 @@
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
+    __udivdi3; # x86
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1274,7 +1275,6 @@
     __swbuf; # arm x86 mips
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
-    __udivdi3; # arm x86 mips
     __umoddi3; # x86 mips
     __wait4; # arm x86 mips nobrillo
     _fwalk; # arm x86 mips