summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authoramodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4>2012-04-14 13:24:43 +0000
committeramodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4>2012-04-14 13:24:43 +0000
commite39d16335210f0ee97d5cfae7199a6ee0899bd78 (patch)
tree8d5a01f03c69bea976f56e97e4655ab97cc068f1 /libstdc++-v3
parent9837bf0eea917a4afc800c95344ebc8144b8bf20 (diff)
downloadgcc-e39d16335210f0ee97d5cfae7199a6ee0899bd78.tar.gz
PR libstdc++/52839
* acinclude.m4 (_GLIBCXX_ATOMIC_BUILTINS): Do not depend on glibcxx_cv_atomic_long_long. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186453 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/acinclude.m45
-rwxr-xr-xlibstdc++-v3/configure11
3 files changed, 14 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d241a8bef39..f4d4c1fd471 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-14 Alan Modra <amodra@gmail.com>
+
+ PR libstdc++/52839
+ * acinclude.m4 (_GLIBCXX_ATOMIC_BUILTINS): Do not depend on
+ glibcxx_cv_atomic_long_long.
+ * configure: Regenerate.
+
2012-04-13 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/26_numerics/cmath/51083.cc: Move...
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 01b06e490d7..6632725b7ec 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -2861,11 +2861,10 @@ EOF
CXXFLAGS="$old_CXXFLAGS"
AC_LANG_RESTORE
- # Set atomicity_dir to builtins if all of above tests pass.
+ # Set atomicity_dir to builtins if all but the long long test above passes.
if test $glibcxx_cv_atomic_bool = yes \
&& test $glibcxx_cv_atomic_short = yes \
- && test $glibcxx_cv_atomic_int = yes \
- && test $glibcxx_cv_atomic_long_long = yes ; then
+ && test $glibcxx_cv_atomic_int = yes; then
AC_DEFINE(_GLIBCXX_ATOMIC_BUILTINS, 1,
[Define if the compiler supports C++11 atomics.])
atomicity_dir=cpu/generic/atomicity_builtins
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 48f6ed6ff4e..468b4131471 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -15446,11 +15446,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- # Set atomicity_dir to builtins if all of above tests pass.
+ # Set atomicity_dir to builtins if all but the long long test above passes.
if test $glibcxx_cv_atomic_bool = yes \
&& test $glibcxx_cv_atomic_short = yes \
- && test $glibcxx_cv_atomic_int = yes \
- && test $glibcxx_cv_atomic_long_long = yes ; then
+ && test $glibcxx_cv_atomic_int = yes; then
$as_echo "#define _GLIBCXX_ATOMIC_BUILTINS 1" >>confdefs.h
@@ -15482,7 +15481,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu
# unnecessary for this test.
cat > conftest.$ac_ext << EOF
-#line 15485 "configure"
+#line 15484 "configure"
int main()
{
_Decimal32 d1;
@@ -15524,7 +15523,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# unnecessary for this test.
cat > conftest.$ac_ext << EOF
-#line 15527 "configure"
+#line 15526 "configure"
template<typename T1, typename T2>
struct same
{ typedef T2 type; };
@@ -15558,7 +15557,7 @@ $as_echo "$enable_int128" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
-#line 15561 "configure"
+#line 15560 "configure"
template<typename T1, typename T2>
struct same
{ typedef T2 type; };