diff options
Diffstat (limited to 'gcc-4.9/libstdc++-v3/config')
7 files changed, 42 insertions, 6 deletions
diff --git a/gcc-4.9/libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt b/gcc-4.9/libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt index c24ecc8cc..73c9a997e 100644 --- a/gcc-4.9/libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt +++ b/gcc-4.9/libstdc++-v3/config/abi/post/x86_64-linux-gnu/32/baseline_symbols.txt @@ -2465,6 +2465,7 @@ FUNC:_ZdaPv@@GLIBCXX_3.4 FUNC:_ZdaPvRKSt9nothrow_t@@GLIBCXX_3.4 FUNC:_ZdlPv@@GLIBCXX_3.4 FUNC:_ZdlPvRKSt9nothrow_t@@GLIBCXX_3.4 +FUNC:_ZdlPvj@@GLIBCXX_3.4.18 FUNC:_Znaj@@GLIBCXX_3.4 FUNC:_ZnajRKSt9nothrow_t@@GLIBCXX_3.4 FUNC:_Znwj@@GLIBCXX_3.4 @@ -3671,3 +3672,5 @@ OBJECT:8:_ZTTSi@@GLIBCXX_3.4 OBJECT:8:_ZTTSo@@GLIBCXX_3.4 OBJECT:8:_ZTTSt13basic_istreamIwSt11char_traitsIwEE@@GLIBCXX_3.4 OBJECT:8:_ZTTSt13basic_ostreamIwSt11char_traitsIwEE@@GLIBCXX_3.4 +TLS:4:_ZSt11__once_call@@GLIBCXX_3.4.11 +TLS:4:_ZSt15__once_callable@@GLIBCXX_3.4.11 diff --git a/gcc-4.9/libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt b/gcc-4.9/libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt index d86b83042..84f22ac66 100644 --- a/gcc-4.9/libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt +++ b/gcc-4.9/libstdc++-v3/config/abi/post/x86_64-linux-gnu/baseline_symbols.txt @@ -2465,6 +2465,7 @@ FUNC:_ZdaPv@@GLIBCXX_3.4 FUNC:_ZdaPvRKSt9nothrow_t@@GLIBCXX_3.4 FUNC:_ZdlPv@@GLIBCXX_3.4 FUNC:_ZdlPvRKSt9nothrow_t@@GLIBCXX_3.4 +FUNC:_ZdlPvm@@GLIBCXX_3.4.18 FUNC:_Znam@@GLIBCXX_3.4 FUNC:_ZnamRKSt9nothrow_t@@GLIBCXX_3.4 FUNC:_Znwm@@GLIBCXX_3.4 diff --git a/gcc-4.9/libstdc++-v3/config/abi/pre/gnu.ver b/gcc-4.9/libstdc++-v3/config/abi/pre/gnu.ver index f3afb9419..75423d222 100644 --- a/gcc-4.9/libstdc++-v3/config/abi/pre/gnu.ver +++ b/gcc-4.9/libstdc++-v3/config/abi/pre/gnu.ver @@ -1333,6 +1333,9 @@ GLIBCXX_3.4.18 { # std::this_thread::__sleep_for _ZNSt11this_thread11__sleep_for*; + # operator delete(void*, , unsigned long) + _ZdlPv[jmy]; + # std::bad_function_call::what() _ZNKSt17bad_function_call4whatEv; diff --git a/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.cc b/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.cc index 6ce044152..35ae2c921 100644 --- a/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.cc +++ b/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.cc @@ -52,13 +52,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Assumes __s formatted for "C" locale. char* __old = setlocale(LC_ALL, 0); char* __sav = 0; +#if defined (__ANDROID__) if (__old) { +#endif const size_t __len = strlen(__old) + 1; __sav = new char[__len]; memcpy(__sav, __old, __len); setlocale(LC_ALL, "C"); +#if defined (__ANDROID__) } +#endif char* __sanity; bool __overflow = false; @@ -121,13 +125,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Assumes __s formatted for "C" locale. char* __old = setlocale(LC_ALL, 0); char* __sav = 0; +#if defined (__ANDROID__) if (__old) { +#endif const size_t __len = strlen(__old) + 1; __sav = new char[__len]; memcpy(__sav, __old, __len); setlocale(LC_ALL, "C"); +#if defined (__ANDROID__) } +#endif char* __sanity; #if !__DBL_HAS_INFINITY__ @@ -170,13 +178,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Assumes __s formatted for "C" locale. char* __old = setlocale(LC_ALL, 0); char* __sav = 0; +#if defined (__ANDROID__) if (__old) { +#endif const size_t __len = strlen(__old) + 1; __sav = new char[__len]; memcpy(__sav, __old, __len); setlocale(LC_ALL, "C"); +#if defined (__ANDROID__) } +#endif #if !__LDBL_HAS_INFINITY__ errno = 0; diff --git a/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h b/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h index aedb13ffe..028c18570 100644 --- a/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h +++ b/gcc-4.9/libstdc++-v3/config/locale/generic/c_locale.h @@ -59,13 +59,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { char* __old = std::setlocale(LC_NUMERIC, 0); char* __sav = 0; - if (__old && __builtin_strcmp(__old, "C")) - { - const size_t __len = __builtin_strlen(__old) + 1; - __sav = new char[__len]; - __builtin_memcpy(__sav, __old, __len); - std::setlocale(LC_NUMERIC, "C"); +#if defined (__ANDROID__) + if (__old) + { +#endif + if (__builtin_strcmp(__old, "C")) + { + const size_t __len = __builtin_strlen(__old) + 1; + __sav = new char[__len]; + __builtin_memcpy(__sav, __old, __len); + std::setlocale(LC_NUMERIC, "C"); + } +#if defined (__ANDROID__) } +#endif __builtin_va_list __args; __builtin_va_start(__args, __fmt); diff --git a/gcc-4.9/libstdc++-v3/config/locale/generic/time_members.cc b/gcc-4.9/libstdc++-v3/config/locale/generic/time_members.cc index 2ed10f561..4b5f9fd5d 100644 --- a/gcc-4.9/libstdc++-v3/config/locale/generic/time_members.cc +++ b/gcc-4.9/libstdc++-v3/config/locale/generic/time_members.cc @@ -45,13 +45,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { char* __old = setlocale(LC_ALL, 0); char* __sav = 0; +#if defined (__ANDROID__) if (__old) { +#endif const size_t __llen = strlen(__old) + 1; __sav = new char[__llen]; memcpy(__sav, __old, __llen); setlocale(LC_ALL, _M_name_timepunct); +#if defined (__ANDROID__) } +#endif const size_t __len = strftime(__s, __maxlen, __format, __tm); setlocale(LC_ALL, __sav); delete [] __sav; @@ -134,13 +138,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { char* __old = setlocale(LC_ALL, 0); char* __sav = 0; +#if defined (__ANDROID__) if (__old) { +#endif const size_t __llen = strlen(__old) + 1; __sav = new char[__llen]; memcpy(__sav, __old, __llen); setlocale(LC_ALL, _M_name_timepunct); +#if defined (__ANDROID__) } +#endif const size_t __len = wcsftime(__s, __maxlen, __format, __tm); setlocale(LC_ALL, __sav); delete [] __sav; diff --git a/gcc-4.9/libstdc++-v3/config/os/bionic/ctype_base.h b/gcc-4.9/libstdc++-v3/config/os/bionic/ctype_base.h index a6ccfb92d..d713e0cd1 100644 --- a/gcc-4.9/libstdc++-v3/config/os/bionic/ctype_base.h +++ b/gcc-4.9/libstdc++-v3/config/os/bionic/ctype_base.h @@ -30,6 +30,7 @@ // Support for Solaris 2.5.1 +#if defined (__ANDROID__) #if !defined(_U) #if !defined(_CTYPE_U) #error Bionic header ctype.h does not define either _U nor _CTYPE_U @@ -43,6 +44,7 @@ #define _X _CTYPE_X #define _B _CTYPE_B #endif +#endif /* __ANDROID__ */ namespace std _GLIBCXX_VISIBILITY(default) { |