Makefile.am (install-freestanding-headers): Add concept_check.h and move.h to the...

2016-03-23  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        * include/Makefile.am (install-freestanding-headers): Add
        concept_check.h and move.h to the installed headers.
        * include/Makefile.in: Regenerated.
        * include/bits/concept_check.h: Ignore _GLIBCXX_CONCEPT_CHECKS for
        freestanding implementations.
        * doc/xml/manual/using.xml (_GLIBCXX_CONCEPT_CHECKS): Mention
        that this macro has no effect for freestanding implementations.
        * doc/html/manual/using_macros.html: Likewise.

From-SVN: r234414

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8d5312dbc9dd7d522941558066c247f170036a98..a2cb3d70008d327873b58bc357f1bcd014e2f01b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2016-03-23  Bernd Edlinger  <bernd.edlinger@hotmail.de>
+
+       * include/Makefile.am (install-freestanding-headers): Add
+       concept_check.h and move.h to the installed headers.
+       * include/Makefile.in: Regenerated.
+       * include/bits/concept_check.h: Ignore _GLIBCXX_CONCEPT_CHECKS for
+       freestanding implementations.
+       * doc/xml/manual/using.xml (_GLIBCXX_CONCEPT_CHECKS): Mention
+       that this macro has no effect for freestanding implementations.
+       * doc/html/manual/using_macros.html: Likewise.
+
 2016-02-24  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/69939

diff --git a/libstdc++-v3/doc/html/manual/using_macros.html b/libstdc++-v3/doc/html/manual/using_macros.html
index 2ef05af4acd7efc4974447104affa68e1c38b95c..0998b38935589ac41523a747bf51e6f4b6aff9f0 100644 (file)
--- a/libstdc++-v3/doc/html/manual/using_macros.html
+++ b/libstdc++-v3/doc/html/manual/using_macros.html
@@ -66,7 +66,8 @@
        <code class="code">--enable-concept-checks</code>.  When defined, performs
        compile-time checking on certain template instantiations to
        detect violations of the requirements of the standard.  This
-       is described in more detail in
+       macro has no effect for freestanding implementations.
+       This is described in more detail in
        <a class="link" href="ext_compile_checks.html" title="Chapter 16. Compile Time Checks">Compile Time Checks</a>.
       </p></dd><dt><span class="term"><code class="code">_GLIBCXX_ASSERTIONS</code></span></dt><dd><p>
        Undefined by default. When defined, enables extra error checking in

diff --git a/libstdc++-v3/doc/xml/manual/using.xml b/libstdc++-v3/doc/xml/manual/using.xml
index 6e022d5458a5747c73ea06a49be8a96d4fcc3153..231028e6b611366043627208041494b7c683309c 100644 (file)
--- a/libstdc++-v3/doc/xml/manual/using.xml
+++ b/libstdc++-v3/doc/xml/manual/using.xml
@@ -908,7 +908,8 @@ g++ -Winvalid-pch -I. -include stdc++.h -H -g -O2 hello.cc -o test.exe
        <code>--enable-concept-checks</code>.  When defined, performs
        compile-time checking on certain template instantiations to
        detect violations of the requirements of the standard.  This
-       is described in more detail in
+       macro has no effect for freestanding implementations.
+       This is described in more detail in
        <link linkend="manual.ext.compile_checks">Compile Time Checks</link>.
       </para>
     </listitem></varlistentry>

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 0b34c3c01d3fd739a3259ee747f207abfc9e5041..9cd6a85b9a2240ea8d8dec249338bb168cf33d05 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -1331,7 +1331,7 @@ endif
 # 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 \
+       for file in c++0x_warning.h atomic_base.h concept_check.h move.h; do \
          $(INSTALL_DATA) ${glibcxx_srcdir}/include/bits/$${file} $(DESTDIR)${gxx_include_dir}/bits; done
        $(mkinstalldirs) $(DESTDIR)${host_installdir}
        for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 3bbd3d7724584f5f176a8556b428ccc9848ca2b3..43735f9174cd49c746bfa82e1da0274c7639975d 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1753,7 +1753,7 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
 # 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 \
+       for file in c++0x_warning.h atomic_base.h concept_check.h move.h; do \
          $(INSTALL_DATA) ${glibcxx_srcdir}/include/bits/$${file} $(DESTDIR)${gxx_include_dir}/bits; done
        $(mkinstalldirs) $(DESTDIR)${host_installdir}
        for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \

diff --git a/libstdc++-v3/include/bits/concept_check.h b/libstdc++-v3/include/bits/concept_check.h
index 5c4fb4c3506c16fdc83d97782cd757597c65bf02..11092c0a781e9856fa838f5b1696e7e59c5406ec 100644 (file)
--- a/libstdc++-v3/include/bits/concept_check.h
+++ b/libstdc++-v3/include/bits/concept_check.h
@@ -41,8 +41,9 @@
 
 // Concept-checking code is off by default unless users turn it on via
 // configure options or editing c++config.h.
+// It is not supported for freestanding implementations.
 
-#ifndef _GLIBCXX_CONCEPT_CHECKS
+#if !defined(_GLIBCXX_CONCEPT_CHECKS) || !_GLIBCXX_HOSTED
 
 #define __glibcxx_function_requires(...)
 #define __glibcxx_class_requires(_a,_b)