diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-23 16:47:18 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-23 16:47:18 +0000 |
| commit | 3091577399c03da04b1d8ab90bbca56b19e0358d (patch) | |
| tree | f9ff7da9eeadcd74ec982a2fc7443a9098b993dd /libstdc++-v3/acinclude.m4 | |
| parent | 3dc4e652da19afc1349dfee4bfb6609093ae605a (diff) | |
PR libstdc++/64967
* acinclude.m4: Disable dual ABI when gnu-versioned-namespace in use.
* configure: Regenerate.
* src/c++11/compatibility-c++0x.cc (error_category), generic_category,
system_category): Use macros for versioned namespace.
* src/c++11/futex.cc: Add missing end macro for versioned namespace.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221600 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 74f5a652fb7..a1e301fdaa9 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -3859,6 +3859,10 @@ dnl _GLIBCXX_USE_DUAL_ABI (always defined, either to 1 or 0) dnl AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI], [ GLIBCXX_ENABLE(libstdcxx-dual-abi,$1,,[support two versions of std::string]) + if test x$enable_symvers = xgnu-versioned-namespace; then + # gnu-versioned-namespace is incompatible with the dual ABI. + enable_libstdcxx_dual_abi="no" + fi if test x"$enable_libstdcxx_dual_abi" != xyes; then AC_MSG_NOTICE([dual ABI is disabled]) default_libstdcxx_abi="c++98" |