diff options
| author | Caroline Tice <cmtice@google.com> | 2017-01-19 21:49:36 +0000 |
|---|---|---|
| committer | Caroline Tice <cmtice@google.com> | 2017-01-19 21:49:36 +0000 |
| commit | b5d72c1caca99aa3e3f52e90096c578003d2c4e6 (patch) | |
| tree | 0638b78e152c558bcd145721fc51c6543409a32e | |
| parent | efc7d9bfcc23ed5c741c13dac66f377fd10c3150 (diff) | |
Set c_model to 'c_global' instead of 'c_google' in
configure.host and replace a missing 'std' in complex.
These two fixes are required for building ChromeOS.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_9@244654 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/configure.host | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/complex | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host index c62cfa244d5..a5c038c6521 100644 --- a/libstdc++-v3/configure.host +++ b/libstdc++-v3/configure.host @@ -81,7 +81,7 @@ # Try to guess a default cpu_include_dir based on the name of the CPU. We # cannot do this for os_include_dir; there are too many portable operating # systems out there. :-) -c_model=c_google +c_model=c_global c_compatibility=no atomic_word_dir=cpu/generic atomic_flags="" diff --git a/libstdc++-v3/include/tr1/complex b/libstdc++-v3/include/tr1/complex index 24d63283151..fae2b02efa5 100644 --- a/libstdc++-v3/include/tr1/complex +++ b/libstdc++-v3/include/tr1/complex @@ -316,8 +316,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { typedef typename __gnu_cxx::__promote<_Tp>::__type __type; #if (_GLIBCXX_USE_C99_MATH && !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC) - return ::signbit(__x) ? __type(3.1415926535897932384626433832795029L) - : __type(); + return std::signbit(__x) ? __type(3.1415926535897932384626433832795029L) + : __type(); #else return std::arg(std::complex<__type>(__x)); #endif |