generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

L-MR1 specific fixes

Browse Source 
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
This commit is contained in:
Dmitriy Ivanov 2014-10-01 16:26:49 -07:00
parent 7d971ec14b
commit 1cd0c6777f
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linker/linker.h
View File

@ -89,7 +89,7 @@
#define FLAG_LINKER 0x00000010 // The linker itself #define FLAG_LINKER 0x00000010 // The linker itself
#define FLAG_NEW_SOINFO 0x40000000 // new soinfo format #define FLAG_NEW_SOINFO 0x40000000 // new soinfo format
#define SOINFO_VERSION 1 #define SOINFO_VERSION 0
#define SOINFO_NAME_LEN 128 #define SOINFO_NAME_LEN 128

2
tests/dlfcn_test.cpp
View File

@ -90,7 +90,7 @@ TEST(dlfcn, dlopen_noload) {
} }
// ifuncs are only supported on intel and arm64 for now // 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) { TEST(dlfcn, ifunc) {
typedef const char* (*fn_ptr)(); typedef const char* (*fn_ptr)();

9
tests/libs/Android.mk
View File

@ -294,7 +294,7 @@ include $(TEST_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Library used by ifunc tests # 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 := \ libtest_ifunc_src_files := \
dlopen_testlib_ifunc.c dlopen_testlib_ifunc.c
@ -303,13 +303,6 @@ ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm64 x86 x86_64))
build_type := target build_type := target
build_target := SHARED_LIBRARY 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 include $(TEST_PATH)/Android.build.mk
endif endif