From 3cd4f356e901730e10be2c5f2515e77638d74644 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 27 Aug 2014 18:33:42 +0100 Subject: [PATCH] re PR libstdc++/62159 (Missing headers for freestanding implementation) PR libstdc++/62159 * include/Makefile.am (install-freestanding-headers): Add missing C++11 headers. * include/Makefile.in: Regenerate. From-SVN: r214580 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/Makefile.am | 22 +++++++++++++--------- libstdc++-v3/include/Makefile.in | 22 +++++++++++++--------- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 38c601b5b94..6582e096488 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2014-08-27 Jonathan Wakely + + PR libstdc++/62159 + * include/Makefile.am (install-freestanding-headers): Add missing + C++11 headers. + * include/Makefile.in: Regenerate. + 2014-08-21 Tony Wang * testsuite/18_support/nested_exception/62154.cc: Disable when the diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index e469586077d..5476a378b67 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1223,24 +1223,28 @@ else install-data-local: install-freestanding-headers endif -# This is a subset of the full install-headers rule. We only need , -# , , , , , , and any -# files which they include (and which we provide). The last three headers -# are installed by libsupc++, so only the first four and the sub-includes -# are copied here. +# This is a subset of the full install-headers rule. We only need , +# , , , , , , , +# , , , , , +# , , , and any files which they include (and +# which we provide). +# , , , and are installed by +# libsupc++, so only the others and the sub-includes are copied here. install-freestanding-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/bits + for file in c++0x_warning.h atomic_base.h; do \ + $(INSTALL_DATA) ${glibcxx_srcdir}/include/bits/$${file} $(DESTDIR)${gxx_include_dir}/bits; done $(mkinstalldirs) $(DESTDIR)${host_installdir} - $(INSTALL_DATA) ${glibcxx_srcdir}/include/bits/c++0x_warning.h \ - $(DESTDIR)${gxx_include_dir}/bits for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \ ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \ ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} - $(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir} + for file in limits type_traits atomic; do \ + $(INSTALL_DATA) ${std_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir} - for file in cstddef cstdlib cstdarg; do \ + for file in ciso646 cstddef cfloat climits cstdint cstdlib \ + cstdalign cstdarg cstdbool; do \ $(INSTALL_DATA) ${c_base_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done # The real deal. diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 34ae1d17bd5..bea586ea613 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1627,24 +1627,28 @@ ${pch3_output}: ${pch3_source} ${pch2_output} @GLIBCXX_HOSTED_TRUE@install-data-local: install-headers @GLIBCXX_HOSTED_FALSE@install-data-local: install-freestanding-headers -# This is a subset of the full install-headers rule. We only need , -# , , , , , , and any -# files which they include (and which we provide). The last three headers -# are installed by libsupc++, so only the first four and the sub-includes -# are copied here. +# This is a subset of the full install-headers rule. We only need , +# , , , , , , , +# , , , , , +# , , , and any files which they include (and +# which we provide). +# , , , and are installed by +# libsupc++, so only the others and the sub-includes are copied here. install-freestanding-headers: $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/bits + for file in c++0x_warning.h atomic_base.h; do \ + $(INSTALL_DATA) ${glibcxx_srcdir}/include/bits/$${file} $(DESTDIR)${gxx_include_dir}/bits; done $(mkinstalldirs) $(DESTDIR)${host_installdir} - $(INSTALL_DATA) ${glibcxx_srcdir}/include/bits/c++0x_warning.h \ - $(DESTDIR)${gxx_include_dir}/bits for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \ ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \ ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} - $(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir} + for file in limits type_traits atomic; do \ + $(INSTALL_DATA) ${std_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir} - for file in cstddef cstdlib cstdarg; do \ + for file in ciso646 cstddef cfloat climits cstdint cstdlib \ + cstdalign cstdarg cstdbool; do \ $(INSTALL_DATA) ${c_base_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done # The real deal. -- 2.30.2