Remove -z global workaround for target x86
Change-Id: I08e75a1c7437c97e4af59316d2c14c7fa3f65e03
(cherry picked from commit 933332462d)
			
			
This commit is contained in:
		@@ -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_src_files := dl_df_1_global.cpp
 | 
				
			||||||
libdl_test_df_1_global_ldflags := -Wl,-z,global
 | 
					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
 | 
					# TODO (dimitry): host ld.gold does not yet support -z global
 | 
				
			||||||
# remove this line once it is updated.
 | 
					# remove this line once it is updated.
 | 
				
			||||||
libdl_test_df_1_global_ldflags_host := -fuse-ld=bfd
 | 
					libdl_test_df_1_global_ldflags_host := -fuse-ld=bfd
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user