diff options
| -rw-r--r-- | libc/Android.bp | 7 | ||||
| -rw-r--r-- | libc/arch-arm/dynamic_function_dispatch.cpp | 12 | ||||
| -rw-r--r-- | libc/arch-arm/dynamic_function_wrapper.S | 37 | ||||
| -rw-r--r-- | libm/Android.bp | 3 |
4 files changed, 54 insertions, 5 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index 0098d07c2..d2c6300a5 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -1429,7 +1429,12 @@ cc_library_static { srcs: ["arch-x86/dynamic_function_dispatch.cpp"], }, arm: { - srcs: ["arch-arm/dynamic_function_dispatch.cpp"], + srcs: [ + "arch-arm/dynamic_function_dispatch.cpp", + + // Workaround for b/120254692. + "arch-arm/dynamic_function_wrapper.S", + ], }, }, diff --git a/libc/arch-arm/dynamic_function_dispatch.cpp b/libc/arch-arm/dynamic_function_dispatch.cpp index 640f3306a..09fd8f30e 100644 --- a/libc/arch-arm/dynamic_function_dispatch.cpp +++ b/libc/arch-arm/dynamic_function_dispatch.cpp @@ -89,11 +89,15 @@ static int ifunc_close(int fd) { return r0; } -#define DEFINE_IFUNC(name) \ - name##_func name __attribute__((ifunc(#name "_resolver"))); \ +#define DEFINE_IFUNC_WITH_SUFFIX(name, suffix) \ + name##_func name##suffix __attribute__((ifunc(#name "_resolver"))); \ __attribute__((visibility("hidden"))) \ name##_func* name##_resolver() +#define DEFINE_IFUNC(name) DEFINE_IFUNC_WITH_SUFFIX(name, ) + +#define DEFINE_INTERNAL_IFUNC(name) DEFINE_IFUNC_WITH_SUFFIX(name, _internal) + #define DECLARE_FUNC(type, name) \ __attribute__((visibility("hidden"))) \ type name @@ -287,7 +291,7 @@ DEFINE_IFUNC(__strcat_chk) { } typedef int strcmp_func(const char* __lhs, const char* __rhs); -DEFINE_IFUNC(strcmp) { +DEFINE_INTERNAL_IFUNC(strcmp) { switch(get_cpu_variant()) { case kCortexA9: RETURN_FUNC(strcmp_func, strcmp_a9); @@ -301,7 +305,7 @@ DEFINE_IFUNC(strcmp) { } typedef size_t strlen_func(const char* __s); -DEFINE_IFUNC(strlen) { +DEFINE_INTERNAL_IFUNC(strlen) { switch(get_cpu_variant()) { case kCortexA9: RETURN_FUNC(strlen_func, strlen_a9); diff --git a/libc/arch-arm/dynamic_function_wrapper.S b/libc/arch-arm/dynamic_function_wrapper.S new file mode 100644 index 000000000..1d2842b5c --- /dev/null +++ b/libc/arch-arm/dynamic_function_wrapper.S @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <private/bionic_asm.h> + +#define FUNCTION_DELEGATE(name, impl) \ +ENTRY(name); \ + b impl; \ +END(name) + +FUNCTION_DELEGATE(strcmp, strcmp_internal) +FUNCTION_DELEGATE(strlen, strlen_internal) diff --git a/libm/Android.bp b/libm/Android.bp index e4ba20d92..80c09dd04 100644 --- a/libm/Android.bp +++ b/libm/Android.bp @@ -504,6 +504,9 @@ cc_library { "-Wl,--Bsymbolic-functions", ], + // b/120614316, non-critical readibility check + tidy_checks: ["-cert-dcl16-c"], + include_dirs: ["bionic/libc"], system_shared_libs: ["libc"], |