From eb7c104c90165f25ef1657a35c94f1bafb87a6d6 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Fri, 8 Jan 2016 10:03:09 -0800 Subject: [PATCH] Add missing __gnu_Unwind_Find_exidx symbol Also since __aeabi* and __gnu_Unwind_Find_exidx symbols were incorrectly versioned in M (android-23) remove them from the version script for all platform versions <= 23 Bug: https://github.com/android-ndk/ndk/issues/1 Change-Id: I04902aac25a722100fc502600df908bb3a786356 --- .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.versions.txt | 13 ------------- .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.functions.txt | 1 + .../arch-arm/symbols/libc.so.functions.txt | 1 + 12 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ndk/platforms/android-12/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-12/arch-arm/symbols/libc.so.functions.txt index 0d6553f11..3e4f3bf40 100644 --- a/ndk/platforms/android-12/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-12/arch-arm/symbols/libc.so.functions.txt @@ -63,6 +63,7 @@ __get_sp __get_stack_base __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __init_tls __ioctl diff --git a/ndk/platforms/android-14/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-14/arch-arm/symbols/libc.so.functions.txt index c1d59abf2..da3c66140 100644 --- a/ndk/platforms/android-14/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-14/arch-arm/symbols/libc.so.functions.txt @@ -63,6 +63,7 @@ __get_sp __get_stack_base __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __init_tls __ioctl diff --git a/ndk/platforms/android-16/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-16/arch-arm/symbols/libc.so.functions.txt index df693b525..a0c779410 100644 --- a/ndk/platforms/android-16/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-16/arch-arm/symbols/libc.so.functions.txt @@ -63,6 +63,7 @@ __get_sp __get_stack_base __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __init_tls __ioctl diff --git a/ndk/platforms/android-17/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-17/arch-arm/symbols/libc.so.functions.txt index 6f269e95a..458268e68 100644 --- a/ndk/platforms/android-17/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-17/arch-arm/symbols/libc.so.functions.txt @@ -33,6 +33,7 @@ __fstatfs64 __get_h_errno __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __ioctl __libc_init diff --git a/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt index d739ad8ef..88e8a42dd 100644 --- a/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-18/arch-arm/symbols/libc.so.functions.txt @@ -36,6 +36,7 @@ __fstatfs64 __get_h_errno __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __ioctl __isfinite diff --git a/ndk/platforms/android-19/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-19/arch-arm/symbols/libc.so.functions.txt index ebb213de9..c9b1ca34b 100644 --- a/ndk/platforms/android-19/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-19/arch-arm/symbols/libc.so.functions.txt @@ -36,6 +36,7 @@ __fstatfs64 __get_h_errno __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __ioctl __isfinite diff --git a/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt index 126e03ebd..74dc59291 100644 --- a/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-21/arch-arm/symbols/libc.so.functions.txt @@ -49,6 +49,7 @@ __getcpu __getcwd __getpid __getpriority +__gnu_Unwind_Find_exidx __hostalias __ioctl __isfinite diff --git a/ndk/platforms/android-21/arch-arm/symbols/libc.so.versions.txt b/ndk/platforms/android-21/arch-arm/symbols/libc.so.versions.txt index 5a2a95eaa..6612359d5 100644 --- a/ndk/platforms/android-21/arch-arm/symbols/libc.so.versions.txt +++ b/ndk/platforms/android-21/arch-arm/symbols/libc.so.versions.txt @@ -1,19 +1,6 @@ # Generated by genversionscripts.py. Do not edit. LIBC { global: - __aeabi_atexit; # arm - __aeabi_memclr; # arm - __aeabi_memclr4; # arm - __aeabi_memclr8; # arm - __aeabi_memcpy; # arm - __aeabi_memcpy4; # arm - __aeabi_memcpy8; # arm - __aeabi_memmove; # arm - __aeabi_memmove4; # arm - __aeabi_memmove8; # arm - __aeabi_memset; # arm - __aeabi_memset4; # arm - __aeabi_memset8; # arm __assert; __assert2; __atomic_cmpxchg; # arm diff --git a/ndk/platforms/android-3/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-3/arch-arm/symbols/libc.so.functions.txt index 2990a129e..6d9a06c9a 100644 --- a/ndk/platforms/android-3/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-3/arch-arm/symbols/libc.so.functions.txt @@ -52,6 +52,7 @@ __get_res_cache __get_stack_base __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __init_tls __ioctl diff --git a/ndk/platforms/android-5/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-5/arch-arm/symbols/libc.so.functions.txt index a5c32fb77..13734cbeb 100644 --- a/ndk/platforms/android-5/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-5/arch-arm/symbols/libc.so.functions.txt @@ -53,6 +53,7 @@ __get_res_cache __get_stack_base __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __init_tls __ioctl diff --git a/ndk/platforms/android-8/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-8/arch-arm/symbols/libc.so.functions.txt index fbf600b8f..3178913f6 100644 --- a/ndk/platforms/android-8/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-8/arch-arm/symbols/libc.so.functions.txt @@ -62,6 +62,7 @@ __get_sp __get_stack_base __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __init_tls __ioctl diff --git a/ndk/platforms/android-9/arch-arm/symbols/libc.so.functions.txt b/ndk/platforms/android-9/arch-arm/symbols/libc.so.functions.txt index a4c6bb1a4..e4e663c07 100644 --- a/ndk/platforms/android-9/arch-arm/symbols/libc.so.functions.txt +++ b/ndk/platforms/android-9/arch-arm/symbols/libc.so.functions.txt @@ -65,6 +65,7 @@ __get_sp __get_stack_base __getcwd __getpriority +__gnu_Unwind_Find_exidx __hostalias __init_tls __ioctl