diff options
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index b76e8d51b96..f8dbb95265a 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2186,7 +2186,7 @@ AC_DEFUN([GLIBCXX_CHECK_MATH11_PROTO], [ fi AC_MSG_RESULT([$glibcxx_cv_math11_overload]) ;; - *-*-*gnu*) + *-*-*gnu* | *-*-aix*) # If <math.h> defines the obsolete isinf(double) and isnan(double) # functions (instead of or as well as the C99 generic macros) then we # can't define std::isinf(double) and std::isnan(double) in <cmath> @@ -2594,6 +2594,8 @@ AC_DEFUN([GLIBCXX_ENABLE_ALLOCATOR], [ ;; esac + GLIBCXX_CONDITIONAL(ENABLE_ALLOCATOR_NEW, + test $enable_libstdcxx_allocator_flag = new) AC_SUBST(ALLOCATOR_H) AC_SUBST(ALLOCATOR_NAME) ]) @@ -3443,9 +3445,9 @@ EOF AC_LANG_RESTORE # 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; then + if test "$glibcxx_cv_atomic_bool" = yes \ + && test "$glibcxx_cv_atomic_short" = yes \ + && 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 @@ -4344,6 +4346,34 @@ dnl AC_LANG_RESTORE ]) +dnl +dnl Check how size_t is mangled. Copied from libitm. +dnl +AC_DEFUN([GLIBCXX_CHECK_SIZE_T_MANGLING], [ + AC_CACHE_CHECK([how size_t is mangled], + glibcxx_cv_size_t_mangling, [ + AC_TRY_COMPILE([], [extern __SIZE_TYPE__ x; extern unsigned long x;], + [glibcxx_cv_size_t_mangling=m], [ + AC_TRY_COMPILE([], [extern __SIZE_TYPE__ x; extern unsigned int x;], + [glibcxx_cv_size_t_mangling=j], [ + AC_TRY_COMPILE([], + [extern __SIZE_TYPE__ x; extern unsigned long long x;], + [glibcxx_cv_size_t_mangling=y], [ + AC_TRY_COMPILE([], + [extern __SIZE_TYPE__ x; extern unsigned short x;], + [glibcxx_cv_size_t_mangling=t], + [glibcxx_cv_size_t_mangling=x]) + ]) + ]) + ]) + ]) + if test $glibcxx_cv_size_t_mangling = x; then + AC_MSG_ERROR([Unknown underlying type for size_t]) + fi + AC_DEFINE_UNQUOTED(_GLIBCXX_MANGLE_SIZE_T, [$glibcxx_cv_size_t_mangling], + [Define to the letter to which size_t is mangled.]) +]) + # Macros from the top-level gcc directory. m4_include([../config/gc++filt.m4]) m4_include([../config/tls.m4]) |