generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 1d52b8b0: Merge "Remove -z global workaround for target x86"

Browse Source 
* commit '1d52b8b07c327a6ef4936a7b9b08ddd4ee85002e':
  Remove -z global workaround for target x86
This commit is contained in:
Dmitriy Ivanov 2015-05-15 18:05:43 +00:00 committed by Android Git Automerger
commit 408023a498
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/libs/Android.mk
View File

@ -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