Revert "L-MR1 specific fixes"
This reverts commit 1cd0c6777f35b531c9ce78397d0915aa521b3e87.
diff --git a/linker/linker.h b/linker/linker.h
index b985a99..8afeb14 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -89,7 +89,7 @@
#define FLAG_LINKER 0x00000010 // The linker itself
#define FLAG_NEW_SOINFO 0x40000000 // new soinfo format
-#define SOINFO_VERSION 0
+#define SOINFO_VERSION 1
#define SOINFO_NAME_LEN 128
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index b54d13a..1bf186b 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -90,7 +90,7 @@
}
// ifuncs are only supported on intel and arm64 for now
-#if defined(__i386__) || defined(__x86_64__)
+#if defined (__aarch64__) || defined(__i386__) || defined(__x86_64__)
TEST(dlfcn, ifunc) {
typedef const char* (*fn_ptr)();
diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index cac3140..53cd0c6 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -470,7 +470,7 @@
# -----------------------------------------------------------------------------
# Library used by ifunc tests
# -----------------------------------------------------------------------------
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
+ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm64 x86 x86_64))
libtest_ifunc_src_files := \
dlopen_testlib_ifunc.c
@@ -479,6 +479,13 @@
build_type := target
build_target := SHARED_LIBRARY
+ 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
+
include $(TEST_PATH)/Android.build.mk
endif
