Backout changeset 3ced6f84960c (bug 1178266) because it was not reviewed by a peer and isn't a complete fix.
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 31 Oct 2015 07:33:08 +0900
changeset 270516 a193f759f87a8bc4fa1142753c8d3a565696f24e
parent 270515 43cfeecdea7d324a14b0240d9dc7c5ab09cd5ab1
child 270517 bda7d1b3f5b2188d82e51fca69eba584ea64edae
push id29616
push userphilringnalda@gmail.com
push dateSun, 01 Nov 2015 00:00:59 +0000
treeherdermozilla-central@e958f522a72c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1178266
milestone45.0a1
backs out3ced6f84960c75d6729de7b11d48b03a49adb5a8
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout changeset 3ced6f84960c (bug 1178266) because it was not reviewed by a peer and isn't a complete fix.
build/autoconf/toolchain.m4
mfbt/moz.build
--- a/build/autoconf/toolchain.m4
+++ b/build/autoconf/toolchain.m4
@@ -219,43 +219,17 @@ if test "$GNU_CXX"; then
                             ac_cv_cxx0x_clang_workaround="no")])
 
         if test "ac_cv_cxx0x_clang_workaround" = "no"; then
             AC_MSG_ERROR([Your toolchain does not support C++0x/C++11 mode properly. Please upgrade your toolchain])
         fi
     elif test "$ac_cv_cxx0x_headers_bug" = "yes"; then
         AC_MSG_ERROR([Your toolchain does not support C++0x/C++11 mode properly. Please upgrade your toolchain])
     fi
-
-    AC_CACHE_CHECK([whether 64-bits std::atomic requires -latomic],
-        ac_cv_needs_atomic,
-        AC_TRY_LINK(
-            [#include <cstdint>
-             #include <atomic>],
-            [ std::atomic<uint64_t> foo; foo = 1; ],
-            ac_cv_needs_atomic=no,
-            _SAVE_LIBS="$LIBS"
-            LIBS="$LIBS -latomic"
-            AC_TRY_LINK(
-                [#include <cstdint>
-                 #include <atomic>],
-                [ std::atomic<uint64_t> foo; foo = 1; ],
-                ac_cv_needs_atomic=yes,
-                ac_cv_needs_atomic="do not know; assuming no")
-            LIBS="$_SAVE_LIBS"
-        )
-    )
-    if test "$ac_cv_needs_atomic" = yes; then
-      MOZ_NEEDS_LIBATOMIC=1
-    else
-      MOZ_NEEDS_LIBATOMIC=
-    fi
-    AC_SUBST(MOZ_NEEDS_LIBATOMIC)
 fi
-
 if test -n "$CROSS_COMPILE"; then
     dnl When cross compile, we have no variable telling us what the host compiler is. Figure it out.
     cat > conftest.C <<EOF
 #if defined(__clang__)
 COMPILER CLANG __clang_major__.__clang_minor__.__clang_patchlevel__
 #elif defined(__GNUC__)
 COMPILER GCC __GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
 #endif
--- a/mfbt/moz.build
+++ b/mfbt/moz.build
@@ -119,11 +119,8 @@ DISABLE_STL_WRAPPING = True
 # TODO: Remove these suppressions after bug 993267 is fixed.
 
 if CONFIG['GNU_CXX']:
     SOURCES['/mfbt/Compression.cpp'].flags += ['-Wno-unused-function']
 
 if CONFIG['_MSC_VER']:
     # Error 4804 is "'>' : unsafe use of type 'bool' in operation"
     SOURCES['/mfbt/Compression.cpp'].flags += ['-wd4804']
-
-if CONFIG['MOZ_NEEDS_LIBATOMIC']:
-    OS_LIBS += ['atomic']