summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-03-13 12:43:30 -0700
committerDimitry Ivanov <dimitry@google.com>2015-03-13 19:48:03 +0000
commit2e16d2cf1e477af1db92efde389a5ce0a8e6fbb3 (patch)
treeb94bcc714add9028cf875933cade2e284b951b85
parentbe86f87711ee71ff971da2e2ae7a092081177951 (diff)
downloadbionic-2e16d2cf1e477af1db92efde389a5ce0a8e6fbb3.zip
bionic-2e16d2cf1e477af1db92efde389a5ce0a8e6fbb3.tar.gz
bionic-2e16d2cf1e477af1db92efde389a5ce0a8e6fbb3.tar.bz2
Switch libc and libm to sysv-only hash style
Bug: 19059885 Change-Id: I60a23dc5f9c756994d566818332ca42b305b4a05
-rw-r--r--libc/Android.mk2
-rw-r--r--libm/Android.mk2
2 files changed, 2 insertions, 2 deletions
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_CONLYFLAGS := $(libc_common_conlyflags)
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 := \
diff --git a/libm/Android.mk b/libm/Android.mk
index 2f30c82..c7b777d 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -439,7 +439,7 @@ include $(BUILD_STATIC_LIBRARY)
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)