diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-04-29 21:51:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-29 21:51:33 +0000 |
| commit | ca402b961dcf81f1983c5da8d694aa4101daa216 (patch) | |
| tree | 0f19537a2dc9c7dbb62cfb5a095bdeca54de8d48 /gcc-4.9 | |
| parent | 3366b351322dd21a54abe0f78177e72f963f573c (diff) | |
| parent | d7c9c7963a79b60e2247bd5a41decc80938023f4 (diff) | |
| download | toolchain_gcc-ca402b961dcf81f1983c5da8d694aa4101daa216.tar.gz toolchain_gcc-ca402b961dcf81f1983c5da8d694aa4101daa216.tar.bz2 toolchain_gcc-ca402b961dcf81f1983c5da8d694aa4101daa216.zip | |
Merge "Fix GNU4.7/4.8/4.9 libstdc++ for clang"
Diffstat (limited to 'gcc-4.9')
| -rw-r--r-- | gcc-4.9/libstdc++-v3/include/std/type_traits | 2 | ||||
| -rw-r--r-- | gcc-4.9/libstdc++-v3/libsupc++/eh_globals.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc-4.9/libstdc++-v3/include/std/type_traits b/gcc-4.9/libstdc++-v3/include/std/type_traits index 0261c7de9..86fde9e0c 100644 --- a/gcc-4.9/libstdc++-v3/include/std/type_traits +++ b/gcc-4.9/libstdc++-v3/include/std/type_traits @@ -259,7 +259,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION struct __is_floating_point_helper<long double> : public true_type { }; -#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128) +#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128) && (!defined(__clang__) || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4)) template<> struct __is_floating_point_helper<__float128> : public true_type { }; diff --git a/gcc-4.9/libstdc++-v3/libsupc++/eh_globals.cc b/gcc-4.9/libstdc++-v3/libsupc++/eh_globals.cc index 12e48db6a..a790246a0 100644 --- a/gcc-4.9/libstdc++-v3/libsupc++/eh_globals.cc +++ b/gcc-4.9/libstdc++-v3/libsupc++/eh_globals.cc @@ -93,9 +93,9 @@ struct __eh_globals_init bool _M_init; __eh_globals_init() : _M_init(false) - { + { if (__gthread_active_p()) - _M_init = __gthread_key_create(&_M_key, eh_globals_dtor) == 0; + _M_init = __gthread_key_create(&_M_key, eh_globals_dtor) == 0; } ~__eh_globals_init() |