From 933332462d37dfa121fa691095cdce218a0139bf Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Thu, 14 May 2015 21:28:21 -0700
Subject: [PATCH] Remove -z global workaround for target x86

Change-Id: I08e75a1c7437c97e4af59316d2c14c7fa3f65e03
---
 tests/libs/Android.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index 4e275ed4c..15fa55c21 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -355,10 +355,7 @@ include $(LOCAL_PATH)/Android.build.testlib.mk
 # -----------------------------------------------------------------------------
 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