Attachment #438416 for bug #586366

View | Details | Raw Unified | Return to bug 586366
Collapse All | Expand All




AC_DEFUN([MOZ_NEED_LATOMIC_CHECK],
[
  AC_LANG_CPLUSPLUS

  AC_CACHE_CHECK([whether -latomic is needed for proper std::atomic<T> support],
    [moz_cv_need_latomic],

    [AC_TRY_LINK(
      [#include <atomic>],
      [std::atomic<double> at_dbl;
       at_dbl.store (0.0);],

      [moz_cv_need_latomic=no],

      [_SAVE_LIBS="$LIBS"
       LIBS="$LIBS -latomic"

       AC_TRY_LINK(
         [#include <atomic>],
         [std::atomic<double> at_dbl;
          at_dbl.store (0.0);],

         [moz_cv_need_latomic=yes],
         [AC_MSG_WARN([failed to build the test both with and without -latomic])
          moz_cv_need_latomic=no
          LIBS="$_SAVE_LIBS"]])
    ]))
])

Lines 18-23 Link Here

(-)seamonkey-2.40.old/mozilla/aclocal.m4 (+1 lines)
18	builtin(include, build/autoconf/mozprog.m4)dnl	18	builtin(include, build/autoconf/mozprog.m4)dnl
19	builtin(include, build/autoconf/mozheader.m4)dnl	19	builtin(include, build/autoconf/mozheader.m4)dnl
20	builtin(include, build/autoconf/mozcommonheader.m4)dnl	20	builtin(include, build/autoconf/mozcommonheader.m4)dnl
		21	builtin(include, build/autoconf/need-latomic.m4)dnl
21	builtin(include, build/autoconf/lto.m4)dnl	22	builtin(include, build/autoconf/lto.m4)dnl
22	builtin(include, build/autoconf/frameptr.m4)dnl	23	builtin(include, build/autoconf/frameptr.m4)dnl
23	builtin(include, build/autoconf/compiler-opts.m4)dnl	24	builtin(include, build/autoconf/compiler-opts.m4)dnl

Lines 2576-2581 Link Here

(-)seamonkey-2.40.old/mozilla/configure.in (+1 lines)
2576	AC_LANG_CPLUSPLUS	2576	AC_LANG_CPLUSPLUS
2577		2577
2578	MOZ_CXX11	2578	MOZ_CXX11
		2579	MOZ_NEED_LATOMIC_CHECK
2579		2580
2580	AC_LANG_C	2581	AC_LANG_C
2581		2582

Return to bug 586366

Added Link Here

(-) (+28 lines)
1	AC_DEFUN([MOZ_NEED_LATOMIC_CHECK],
2	[
3	AC_LANG_CPLUSPLUS
4
5	AC_CACHE_CHECK([whether -latomic is needed for proper std::atomic<T> support],
6	[moz_cv_need_latomic],
7
8	[AC_TRY_LINK(
9	[#include <atomic>],
10	[std::atomic<double> at_dbl;
11	at_dbl.store (0.0);],
12
13	[moz_cv_need_latomic=no],
14
15	[_SAVE_LIBS="$LIBS"
16	LIBS="$LIBS -latomic"
17
18	AC_TRY_LINK(
19	[#include <atomic>],
20	[std::atomic<double> at_dbl;
21	at_dbl.store (0.0);],
22
23	[moz_cv_need_latomic=yes],
24	[AC_MSG_WARN([failed to build the test both with and without -latomic])
25	moz_cv_need_latomic=no
26	LIBS="$_SAVE_LIBS"]])
27	]))
28	])