Use bfd linker for x86/x86_64 targets
ld.gold in current toolchain for x86_64
does not support -z global.
Change-Id: Iea2b192f0f0aa998a02adb356fd4eec4e10a1739
diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index cd6709a..8afe177 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -349,6 +349,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