diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-01 16:26:49 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-01 16:26:49 -0700 |
| commit | 1cd0c6777f35b531c9ce78397d0915aa521b3e87 (patch) | |
| tree | 5d5e7153dacff21a9ca78c6f944e939804a908a1 /tests | |
| parent | 7d971ec14b80cac442aeea8d88e9eb2e3ab6f214 (diff) | |
| download | bionic-1cd0c6777f35b531c9ce78397d0915aa521b3e87.zip bionic-1cd0c6777f35b531c9ce78397d0915aa521b3e87.tar.gz bionic-1cd0c6777f35b531c9ce78397d0915aa521b3e87.tar.bz2 | |
L-MR1 specific fixes
Reset soinfo version to 0.
Disable ifunc test for arm64 because of old toolchain
in lmp-mr1-dev branch
Note: this commit should be reverted in -plus-aosp branch.
Change-Id: I2d6d996d43bc35d5d4975c745779f43a988b31e6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dlfcn_test.cpp | 2 | ||||
| -rw-r--r-- | tests/libs/Android.mk | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp index 756f2ff..9c9fbdd 100644 --- a/tests/dlfcn_test.cpp +++ b/tests/dlfcn_test.cpp @@ -90,7 +90,7 @@ TEST(dlfcn, dlopen_noload) { } // ifuncs are only supported on intel and arm64 for now -#if defined (__aarch64__) || defined(__i386__) || defined(__x86_64__) +#if 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 548dce3..b355488 100644 --- a/tests/libs/Android.mk +++ b/tests/libs/Android.mk @@ -294,7 +294,7 @@ include $(TEST_PATH)/Android.build.mk # ----------------------------------------------------------------------------- # Library used by ifunc tests # ----------------------------------------------------------------------------- -ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm64 x86 x86_64)) +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) libtest_ifunc_src_files := \ dlopen_testlib_ifunc.c @@ -303,13 +303,6 @@ ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm64 x86 x86_64)) 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 |