commit ff407803dbbee26ab19c02aaece0e75c019534c4
author Dmitriy Ivanov <dimitry@google.com> Thu May 14 21:28:21 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri May 15 10:30:47 2015 -0700
tree baf2b9f3eac21c0ad345cf67f21c6e0fd53b12c0
parent d7ad443cfd4e1315cdf45210bc94bb68e0564b8f

Remove -z global workaround for target x86

Change-Id: I08e75a1c7437c97e4af59316d2c14c7fa3f65e03
(cherry picked from commit 933332462d37dfa121fa691095cdce218a0139bf)

tests/libs/Android.mk

diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index 4e275ed..15fa55c 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -355,10 +355,7 @@
 # -----------------------------------------------------------------------------
 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