commit 81c31bdd43e50538fa45f5e7783782a5ae5666e9
author Christopher Ferris <cferris@google.com> Fri Mar 13 21:12:05 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 13 21:12:07 2015 +0000
tree 8f297a1786a24db782891f3e20414ea0f563fcc1
parent d7e091efc477c17da97415fa944675c6f16dcdb5
parent c94c7ff2bb7cdc8638d2155b8eefd8e2538eea50

Merge "Add some GNU specific elf constants."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 293b70e..7bbdd99 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1326,7 +1326,7 @@
 LOCAL_CPPFLAGS := $(libc_common_cppflags)
 
 # TODO: This is to work around b/19059885. Remove after root cause is fixed
-LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
+LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv
 
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
 LOCAL_SRC_FILES := \

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index 529dda8..6472a15 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -514,7 +514,7 @@
 include $(CLEAR_VARS)
 
 # TODO: This is to work around b/19059885. Remove after root cause is fixed
-LOCAL_LDFLAGS_arm := -Wl,--hash-style=both
+LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv
 
 LOCAL_MODULE := libm
 LOCAL_CLANG := $(libm_clang)