diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-05-15 17:53:39 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-05-15 18:39:16 -0700 |
| commit | 69a5fb951d69689dedd83cb033ae3dcd0ef05b65 (patch) | |
| tree | 81540a3dd46f0a604f90993d371c207f5bf3e721 /libc | |
| parent | ff407803dbbee26ab19c02aaece0e75c019534c4 (diff) | |
| download | bionic-69a5fb951d69689dedd83cb033ae3dcd0ef05b65.zip bionic-69a5fb951d69689dedd83cb033ae3dcd0ef05b65.tar.gz bionic-69a5fb951d69689dedd83cb033ae3dcd0ef05b65.tar.bz2 | |
Apply work around b/19059885 to x86
Bug: http://b/19059885
Bug: http://b/21203348
Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 9679494..8b4f90e 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1392,6 +1392,7 @@ 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=both +LOCAL_LDFLAGS_x86 := -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)) @@ -1522,6 +1523,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_x86 := -Wl,--hash-style=both LOCAL_SRC_FILES := $(libstdcxx_common_src_files) LOCAL_MODULE:= libstdc++ |