libdl \
libpagemap \
libdl_preempt_test_1 \
- libdl_preempt_test_2 \
- libdl_test_df_1_global
+ libdl_preempt_test_2
+
+ifneq ($(filter $(TARGET_ARCH),arm arm64),$(TARGET_ARCH))
+bionic-unit-tests_shared_libraries_target += libdl_test_df_1_global
+endif
module := bionic-unit-tests
module_tag := optional
bionic-unit-tests-glibc_shared_libraries := \
libdl_preempt_test_1 \
- libdl_preempt_test_2 \
- libdl_test_df_1_global
+ libdl_preempt_test_2
+
+ifneq ($(filter $(TARGET_ARCH),arm arm64),$(TARGET_ARCH))
+bionic-unit-tests-glibc_shared_libraries += libdl_test_df_1_global
+endif
bionic-unit-tests-glibc_whole_static_libraries := \
libBionicStandardTests \
}
TEST(dlfcn, dlsym_df_1_global) {
-#if !defined(__arm__)
+#if !defined(__arm__) && !defined(__aarch64__)
void* handle = dlopen("libtest_dlsym_df_1_global.so", RTLD_NOW);
ASSERT_TRUE(handle != nullptr) << dlerror();
int (*get_answer)();
ASSERT_EQ(42, get_answer());
ASSERT_EQ(0, dlclose(handle));
#else
- GTEST_LOG_(INFO) << "This test does nothing on arm (to be reenabled once b/18137520 or b/18130452 are fixed).\n";
+ GTEST_LOG_(INFO) << "This test does nothing on arm/arm64 (to be reenabled once b/18137520 or b/18130452 are fixed).\n";
#endif
}
# Library with DF_1_GLOBAL
# -----------------------------------------------------------------------------
# TODO: re-enable arm once b/18137520 or b/18130452 are fixed
-ifeq ($(filter $(TARGET_ARCH),arm),)
+ifeq ($(filter $(TARGET_ARCH),arm arm64),)
libdl_test_df_1_global_src_files := dl_df_1_global.cpp
libdl_test_df_1_global_ldflags := -fuse-ld=bfd -Wl,-z,global
module := libdl_test_df_1_global