diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2008-04-17 13:36:31 +0000 |
|---|---|---|
| committer | H.J. Lu <hongjiu.lu@intel.com> | 2008-04-17 13:36:31 +0000 |
| commit | 875c29bd56b93044d7a3b7ef98aba381d88bfd4a (patch) | |
| tree | d292ba1c72f874d59e8a043988b53dbc20134013 /libstdc++-v3 | |
| parent | 634e7812376b062955ac72285a030559259f011f (diff) | |
Merged with trunk at revision 134359.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/stack@134394 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 11 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 4 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/c++config | 3 |
4 files changed, 18 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0c6e5206916..fb3e6224579 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2008-04-14 Benjamin Kosnik <bkoz@redhat.com> + + PR libstdc++/35816 + * acinclude.m4 (GLIBCXX_ENABLE_ATOMIC_BUILTINS): Set CXXFLAGS to + -O0 when checking for atomic builtins. + * configure: Regenerate. + +2008-04-14 Benjamin Kosnik <bkoz@redhat.com> + + * include/bits/c++config: Guard _LDBL_ macros with __cplusplus. + 2008-04-10 Benjamin Kosnik <bkoz@redhat.com> * doc/html/*: Regenerate. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index e1712b77d80..b25c5add572 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2292,7 +2292,7 @@ int main() } EOF old_CXXFLAGS="$CXXFLAGS" - CXXFLAGS=-S + CXXFLAGS='-O0 -S' if AC_TRY_EVAL(ac_compile); then if grep __sync_fetch_and_add conftest.s >/dev/null 2>&1 ; then enable_atomic_builtins=no @@ -2303,6 +2303,7 @@ EOF atomicity_dir=cpu/generic/atomicity_builtins fi fi + AC_MSG_RESULT($enable_atomic_builtins) CXXFLAGS="$old_CXXFLAGS" rm -f conftest* @@ -2311,7 +2312,6 @@ EOF atomicity_dir=cpu/generic/atomicity_mutex fi AC_LANG_RESTORE - AC_MSG_RESULT($enable_atomic_builtins) ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 6e6e1996e62..8ce34b20a93 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -18104,7 +18104,7 @@ int main() } EOF old_CXXFLAGS="$CXXFLAGS" - CXXFLAGS=-S + CXXFLAGS='-O0 -S' if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18122,6 +18122,8 @@ _ACEOF atomicity_dir=cpu/generic/atomicity_builtins fi fi + echo "$as_me:$LINENO: result: $enable_atomic_builtins" >&5 +echo "${ECHO_T}$enable_atomic_builtins" >&6 CXXFLAGS="$old_CXXFLAGS" rm -f conftest* @@ -18135,8 +18137,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - echo "$as_me:$LINENO: result: $enable_atomic_builtins" >&5 -echo "${ECHO_T}$enable_atomic_builtins" >&6 if test $atomicity_dir = cpu/generic/atomicity_mutex ; then { echo "$as_me:$LINENO: WARNING: No native atomic operations are provided for this platform." >&5 diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index e38cfe05184..498bc320265 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -236,7 +236,8 @@ namespace std // XXX GLIBCXX_ABI Deprecated // Namespace associations for long double 128 mode. _GLIBCXX_BEGIN_NAMESPACE(std) -#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__ +#if defined _GLIBCXX_LONG_DOUBLE_COMPAT && defined __LONG_DOUBLE_128__ \ + && defined __cplusplus # define _GLIBCXX_LDBL_NAMESPACE __gnu_cxx_ldbl128:: # define _GLIBCXX_BEGIN_LDBL_NAMESPACE namespace __gnu_cxx_ldbl128 { # define _GLIBCXX_END_LDBL_NAMESPACE } |