Revert "Temporary move __udivdi3 back to LIBC for x86"

This reverts commit bc02fb964a59983521c5f6cf80b1189434952780.

Bug: http://b/26406724
Bug: http://b/26423217
Change-Id: I8e3186fc76502d6818753e5d76a7c145207ed9a3

diff --git a/libc/libc.arm.brillo.map b/libc/libc.arm.brillo.map
index ea2fe9e..317b3b2 100644 (file)
--- a/libc/libc.arm.brillo.map
+++ b/libc/libc.arm.brillo.map
@@ -1402,7 +1402,7 @@ LIBC_PRIVATE {
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
     __truncdfsf2; # arm
-    __udivdi3; # arm mips
+    __udivdi3; # arm x86 mips
     __udivsi3; # arm
     __unorddf2; # arm
     __unordsf2; # arm

diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index 9522759..efd1106 100644 (file)
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -1414,7 +1414,7 @@ LIBC_PRIVATE {
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
     __truncdfsf2; # arm
-    __udivdi3; # arm mips
+    __udivdi3; # arm x86 mips
     __udivsi3; # arm
     __unorddf2; # arm
     __unordsf2; # arm

diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 4d06c52..d2e2b1b 100644 (file)
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -223,7 +223,6 @@ LIBC {
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
-    __udivdi3; # x86
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1456,7 +1455,7 @@ LIBC_PRIVATE {
     __system_property_update; # arm64 x86_64 mips64
     __system_property_wait_any; # arm64 x86_64 mips64
     __truncdfsf2; # arm
-    __udivdi3; # arm mips
+    __udivdi3; # arm x86 mips
     __udivsi3; # arm
     __umoddi3; # x86 mips
     __unorddf2; # arm

diff --git a/libc/libc.mips.brillo.map b/libc/libc.mips.brillo.map
index 9a20726..f268509 100644 (file)
--- a/libc/libc.mips.brillo.map
+++ b/libc/libc.mips.brillo.map
@@ -1264,7 +1264,7 @@ LIBC_PRIVATE {
     __swbuf; # arm x86 mips
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
-    __udivdi3; # arm mips
+    __udivdi3; # arm x86 mips
     __umoddi3; # x86 mips
     _fwalk; # arm x86 mips
     free_malloc_leak_info;

diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index 5981b46..a72d680 100644 (file)
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -1276,7 +1276,7 @@ LIBC_PRIVATE {
     __swbuf; # arm x86 mips
     __swrite; # arm x86 mips
     __swsetup; # arm x86 mips
-    __udivdi3; # arm mips
+    __udivdi3; # arm x86 mips
     __umoddi3; # x86 mips
     __wait4; # arm x86 mips nobrillo
     _fwalk; # arm x86 mips

diff --git a/libc/libc.x86.brillo.map b/libc/libc.x86.brillo.map
index f4de178..333b419 100644 (file)
--- a/libc/libc.x86.brillo.map
+++ b/libc/libc.x86.brillo.map
@@ -205,7 +205,6 @@ LIBC {
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
-    __udivdi3; # x86
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1264,6 +1263,7 @@ LIBC_PRIVATE {
     __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;

diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 064ae19..06640f0 100644 (file)
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -206,7 +206,6 @@ LIBC {
     __timer_getoverrun; # arm x86 mips
     __timer_gettime; # arm x86 mips
     __timer_settime; # arm x86 mips
-    __udivdi3; # x86
     __umask_chk;
     __vsnprintf_chk;
     __vsprintf_chk;
@@ -1276,6 +1275,7 @@ LIBC_PRIVATE {
     __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