diff options
| author | torvald <torvald@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-15 22:42:41 +0000 |
|---|---|---|
| committer | torvald <torvald@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-15 22:42:41 +0000 |
| commit | 13143e139230dc4d72710a6c4c312105aeddce4f (patch) | |
| tree | 2a0e76101e1e20d6aaa161901261dee89f905afb /libstdc++-v3/include/Makefile.am | |
| parent | e390c57d60cfee5ff4889489a6afaf4bda7cb32c (diff) | |
| download | gcc-13143e139230dc4d72710a6c4c312105aeddce4f.tar.gz | |
libstdc++: Make certain exceptions transaction_safe.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232454 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/Makefile.am')
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 07dc48a5567..39327d98b27 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1200,6 +1200,14 @@ stamp-cxx11-abi: echo 0 > stamp-cxx11-abi endif +if ENABLE_ALLOCATOR_NEW +stamp-allocator-new: + echo 1 > stamp-allocator-new +else +stamp-allocator-new: + echo 0 > stamp-allocator-new +endif + # NB: The non-empty default ldbl_compat works around an AIX sed # oddity, see libstdc++/31957 for details. ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ @@ -1210,13 +1218,15 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ stamp-visibility \ stamp-extern-template \ stamp-dual-abi \ - stamp-cxx11-abi + stamp-cxx11-abi \ + stamp-allocator-new @date=`cat ${toplevel_srcdir}/gcc/DATESTAMP` ;\ ns_version=`cat stamp-namespace-version` ;\ visibility=`cat stamp-visibility` ;\ externtemplate=`cat stamp-extern-template` ;\ dualabi=`cat stamp-dual-abi` ;\ cxx11abi=`cat stamp-cxx11-abi` ;\ + allocatornew=`cat stamp-allocator-new` ;\ ldbl_compat='s,g,g,' ;\ grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \ ${CONFIG_HEADER} > /dev/null 2>&1 \ @@ -1227,6 +1237,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \ -e "s,define _GLIBCXX_EXTERN_TEMPLATE$$, define _GLIBCXX_EXTERN_TEMPLATE $$externtemplate," \ -e "s,define _GLIBCXX_USE_DUAL_ABI, define _GLIBCXX_USE_DUAL_ABI $$dualabi," \ -e "s,define _GLIBCXX_USE_CXX11_ABI, define _GLIBCXX_USE_CXX11_ABI $$cxx11abi," \ + -e "s,define _GLIBCXX_USE_ALLOCATOR_NEW, define _GLIBCXX_USE_ALLOCATOR_NEW $$allocatornew," \ -e "$$ldbl_compat" \ < ${glibcxx_srcdir}/include/bits/c++config > $@ ;\ sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \ |