From bc02fb964a59983521c5f6cf80b1189434952780 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Tue, 5 Jan 2016 11:18:42 -0800 Subject: [PATCH] Temporary move __udivdi3 back to LIBC for x86 Bug: http://b/26289334 Bug: http://b/26413821 Change-Id: Ifb0eb6f16aca54cb4a9184a6394992ee57dd3408 --- libc/libc.arm.brillo.map | 2 +- libc/libc.arm.map | 2 +- libc/libc.map.txt | 3 ++- libc/libc.mips.brillo.map | 2 +- libc/libc.mips.map | 2 +- libc/libc.x86.brillo.map | 2 +- libc/libc.x86.map | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libc/libc.arm.brillo.map b/libc/libc.arm.brillo.map index 317b3b2d3..ea2fe9eb6 100644 --- 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 x86 mips + __udivdi3; # arm mips __udivsi3; # arm __unorddf2; # arm __unordsf2; # arm diff --git a/libc/libc.arm.map b/libc/libc.arm.map index efd1106f6..95227591d 100644 --- 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 x86 mips + __udivdi3; # arm mips __udivsi3; # arm __unorddf2; # arm __unordsf2; # arm diff --git a/libc/libc.map.txt b/libc/libc.map.txt index d2e2b1ba4..4d06c52c3 100644 --- a/libc/libc.map.txt +++ b/libc/libc.map.txt @@ -223,6 +223,7 @@ LIBC { __timer_getoverrun; # arm x86 mips __timer_gettime; # arm x86 mips __timer_settime; # arm x86 mips + __udivdi3; # x86 __umask_chk; __vsnprintf_chk; __vsprintf_chk; @@ -1455,7 +1456,7 @@ LIBC_PRIVATE { __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 diff --git a/libc/libc.mips.brillo.map b/libc/libc.mips.brillo.map index f268509ed..9a20726d3 100644 --- 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 x86 mips + __udivdi3; # arm 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 a72d680a7..5981b465b 100644 --- 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 x86 mips + __udivdi3; # arm 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 333b4193c..f4de17808 100644 --- a/libc/libc.x86.brillo.map +++ b/libc/libc.x86.brillo.map @@ -205,6 +205,7 @@ LIBC { __timer_getoverrun; # arm x86 mips __timer_gettime; # arm x86 mips __timer_settime; # arm x86 mips + __udivdi3; # x86 __umask_chk; __vsnprintf_chk; __vsprintf_chk; @@ -1263,7 +1264,6 @@ 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 06640f009..064ae198c 100644 --- a/libc/libc.x86.map +++ b/libc/libc.x86.map @@ -206,6 +206,7 @@ LIBC { __timer_getoverrun; # arm x86 mips __timer_gettime; # arm x86 mips __timer_settime; # arm x86 mips + __udivdi3; # x86 __umask_chk; __vsnprintf_chk; __vsprintf_chk; @@ -1275,7 +1276,6 @@ 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