commit 6f23ce36ce580da3c1419856c71d7426dd64748d
author Elliott Hughes <enh@google.com> Sat Jan 25 01:25:16 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 25 01:25:16 2014 +0000
tree e102909999169cd8422c55f62ce70830e5e921ad
parent b32cc032030e7a9f50b28d6dba5a40a38e6e76cf
parent e2a292d278b94fec3d078b1f1b27c1f89942c276

Merge "Remove __STDC_FORMAT_MACROS and __STDC_LIMIT_MACROS guards (and fix SIZE_MAX for LP64)."

libc/arch-arm/bionic/libgcc_compat.c

diff --git a/libc/arch-arm/bionic/libgcc_compat.c b/libc/arch-arm/bionic/libgcc_compat.c
index abbe98e..f694060 100644
--- a/libc/arch-arm/bionic/libgcc_compat.c
+++ b/libc/arch-arm/bionic/libgcc_compat.c
@@ -119,17 +119,21 @@
     XX(__aeabi_i2d)          \
     XX(__aeabi_i2f)          \
     XX(__aeabi_idiv)         \
+    XX(__aeabi_idivmod)      \
     XX(__aeabi_l2d)          \
     XX(__aeabi_l2f)          \
     XX(__aeabi_lasr)         \
-    XX(__aeabi_lmul)         \
+    XX(__aeabi_ldivmod)      \
     XX(__aeabi_llsl)         \
     XX(__aeabi_llsr)         \
+    XX(__aeabi_lmul)         \
     XX(__aeabi_ui2d)         \
     XX(__aeabi_ui2f)         \
+    XX(__aeabi_uidiv)        \
+    XX(__aeabi_uidivmod)     \
     XX(__aeabi_ul2d)         \
     XX(__aeabi_ul2f)         \
-    XX(__aeabi_uidivmod)     \
+    XX(__aeabi_uldivmod)     \
     XX(__cmpdf2)             \
     XX(__divdf3)             \
     XX(__divsf3)             \

libdl/Android.mk

diff --git a/libdl/Android.mk b/libdl/Android.mk
index 49cfb0c..3d60474 100644
--- a/libdl/Android.mk
+++ b/libdl/Android.mk
@@ -18,9 +18,8 @@
 LOCAL_LDFLAGS := -Wl,--exclude-libs=libgcc.a
 
 # for x86, exclude libgcc_eh.a for the same reasons as above
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
-LOCAL_LDFLAGS += -Wl,--exclude-libs=libgcc_eh.a
-endif
+LOCAL_LDFLAGS_x86 := -Wl,--exclude-libs=libgcc_eh.a
+LOCAL_LDFLAGS_x86_64 := $(LOCAL_LDFLAGS_x86)
 
 LOCAL_SRC_FILES:= libdl.c
 LOCAL_CFLAGS := -Wall -Wextra -Werror