commit 2c256a0f0927abd94f2210b37c18ead210d30477
author Dmitriy Ivanov <dimitry@google.com> Sat Apr 25 05:36:06 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 25 05:36:07 2015 +0000
tree 2de93d1a6e2c09be6467d79cacc57def83733910
parent 440242f03805872a0c62528d763e5e98dad9b580
parent ea295f68f1fae7c701baaa717f67296659d567ac

Merge "Unregister pthread_atfork handlers on dlclose()"

tests/libs/Android.mk

diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index dfebdd8..c432c2e 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -355,6 +355,10 @@
 # -----------------------------------------------------------------------------
 libdl_test_df_1_global_src_files := dl_df_1_global.cpp
 libdl_test_df_1_global_ldflags := -Wl,-z,global
+# TODO (dimitry): x86* toolchain does not support -z global - switch to bfd
+ifeq ($(filter $(TARGET_ARCH),x86 x86_64),$(TARGET_ARCH))
+libdl_test_df_1_global_ldflags_target := -fuse-ld=bfd
+endif
 # TODO (dimitry): host ld.gold does not yet support -z global
 # remove this line once it is updated.
 libdl_test_df_1_global_ldflags_host := -fuse-ld=bfd