diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-05-08 12:05:47 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-05-08 12:17:21 -0700 |
| commit | f7009f450e596dc76352da7ceefc8caeeb74ff14 (patch) | |
| tree | 160bdb228b4e44b9fbbfcdaf569510e6398b9cbb | |
| parent | 5040aa4c393b12ea12fde0fc757995559c0c8e5d (diff) | |
| download | android_bionic-f7009f450e596dc76352da7ceefc8caeeb74ff14.tar.gz android_bionic-f7009f450e596dc76352da7ceefc8caeeb74ff14.tar.bz2 android_bionic-f7009f450e596dc76352da7ceefc8caeeb74ff14.zip | |
Switch libc/libcstdc++/libm to hash-style=both
Bug: http://b/19059885
Change-Id: Ie42703d91f291fd689a1cf9c35bcab5c487b9a84
(cherry picked from commit 88e777d6f46709abebab88421e8c4ea7a9e3d9c4)
| -rw-r--r-- | libc/Android.mk | 4 | ||||
| -rw-r--r-- | libm/Android.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index c8bdb061b..967949451 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1391,7 +1391,7 @@ LOCAL_LDFLAGS := -Wl,--version-script,$(LOCAL_PATH)/version_script.txt LOCAL_LDFLAGS_64 := -Wl,--exclude-libs,libgcc.a # TODO: This is to work around b/19059885. Remove after root cause is fixed -LOCAL_LDFLAGS_arm := -Wl,--hash-style=sysv +LOCAL_LDFLAGS_arm := -Wl,--hash-style=both $(eval $(call patch-up-arch-specific-flags,LOCAL_CFLAGS,libc_common_cflags)) $(eval $(call patch-up-arch-specific-flags,LOCAL_SRC_FILES,libc_arch_dynamic_src_files)) @@ -1521,7 +1521,7 @@ LOCAL_CFLAGS := $(libc_common_cflags) 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=sysv +LOCAL_LDFLAGS_arm := -Wl,--hash-style=both LOCAL_SRC_FILES := $(libstdcxx_common_src_files) LOCAL_MODULE:= libstdc++ diff --git a/libm/Android.mk b/libm/Android.mk index 6472a1542..529dda858 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -514,7 +514,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=sysv +LOCAL_LDFLAGS_arm := -Wl,--hash-style=both LOCAL_MODULE := libm LOCAL_CLANG := $(libm_clang) |