tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable ifunc test for arm

Browse source 
Bug: http://b/27930475
Change-Id: I1f9e7c5b9ffabfd77ae6ebd534938aef39ec7987
This commit is contained in:
Dimitry Ivanov 2016-03-30 16:44:48 -07:00
parent d15837a3b2
commit c967d89245
2 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/dlfcn_test.cpp
View file

@ -211,8 +211,6 @@ TEST(dlfcn, dlopen_by_soname) {
dlclose(handle);
}
// ifuncs are only supported on intel and arm64 for now
#if defined (__aarch64__) || defined(__i386__) || defined(__x86_64__)
TEST(dlfcn, ifunc) {
typedef const char* (*fn_ptr)();
@ -256,7 +254,6 @@ TEST(dlfcn, ifunc_ctor_call) {
ASSERT_STREQ("true", is_ctor_called());
dlclose(handle);
}
#endif
TEST(dlfcn, dlopen_check_relocation_dt_needed_order) {
// This is the structure of the test library and

19
tests/libs/Android.mk
View file

@ -346,25 +346,14 @@ include $(LOCAL_PATH)/Android.build.testlib.mk
libtest_ifunc_src_files := \
dlopen_testlib_ifunc.c
# TODO(dimitry): clang does not support ifunc attribute
libtest_ifunc_clang_host := false
libtest_ifunc_clang_target := false
module := libtest_ifunc
build_target := SHARED_LIBRARY
build_type := host
include $(TEST_PATH)/Android.build.mk
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm64 x86 x86_64))
ifeq ($(TARGET_ARCH),arm64)
libtest_ifunc_multilib := 64
# TODO: This is a workaround - remove it once gcc
# removes its Android ifunc checks
libtest_ifunc_cflags := -mglibc
endif
build_type := target
libtest_ifunc_clang_target := false
include $(TEST_PATH)/Android.build.mk
endif
include $(LOCAL_PATH)/Android.build.testlib.mk
# -----------------------------------------------------------------------------
# Library used by atexit tests