summaryrefslogtreecommitdiff
path: root/libstdc++-v3/doc
diff options
context:
space:
mode:
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2010-04-12 17:07:51 +0000
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>2010-04-12 17:07:51 +0000
commit62b1c600a0343dc41c1fd51563f084ebfce62672 (patch)
tree4d90431d6197738a165896cba377b1cb7a407ba4 /libstdc++-v3/doc
parent575b7ff42a3783f45abb7ecd684975732f8a4eb2 (diff)
downloadgcc-62b1c600a0343dc41c1fd51563f084ebfce62672.tar.gz
Merged r157896 through r158228 into branch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ifunc@158229 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/doc')
-rw-r--r--libstdc++-v3/doc/Makefile.in2
-rw-r--r--libstdc++-v3/doc/html/manual/configure.html4
-rw-r--r--libstdc++-v3/doc/xml/manual/configure.xml4
3 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in
index d584768c377..408961e3f21 100644
--- a/libstdc++-v3/doc/Makefile.in
+++ b/libstdc++-v3/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/libstdc++-v3/doc/html/manual/configure.html b/libstdc++-v3/doc/html/manual/configure.html
index d7cde522e82..c5ee8c3b546 100644
--- a/libstdc++-v3/doc/html/manual/configure.html
+++ b/libstdc++-v3/doc/html/manual/configure.html
@@ -187,8 +187,8 @@
<span class="emphasis"><em>freestanding</em></span> environment, in which only a
minimal set of headers are provided. This option builds such an
environment.
- </p></dd><dt><span class="term"><code class="code">--enable-clock-gettime</code></span></dt><dd><p>This is an abbreviated form of
- <code class="code">'--enable-clock-gettime=yes'</code>(described next).
+ </p></dd><dt><span class="term"><code class="code">--enable-libstdcxx-time</code></span></dt><dd><p>This is an abbreviated form of
+ <code class="code">'--enable-libstdcxx-time=yes'</code>(described next).
</p></dd><dt><span class="term"><code class="code">--enable-libstdcxx-time=OPTION</code></span></dt><dd><p>Enables link-type checks for the availability of the
clock_gettime clocks, used in the implementation of [time.clock],
and of the nanosleep and sched_yield functions, used in the
diff --git a/libstdc++-v3/doc/xml/manual/configure.xml b/libstdc++-v3/doc/xml/manual/configure.xml
index 26d7d51c2c1..8cca56cd828 100644
--- a/libstdc++-v3/doc/xml/manual/configure.xml
+++ b/libstdc++-v3/doc/xml/manual/configure.xml
@@ -324,9 +324,9 @@
</para>
</listitem></varlistentry>
- <varlistentry><term><code>--enable-clock-gettime</code></term>
+ <varlistentry><term><code>--enable-libstdcxx-time</code></term>
<listitem><para>This is an abbreviated form of
- <code>'--enable-clock-gettime=yes'</code>(described next).
+ <code>'--enable-libstdcxx-time=yes'</code>(described next).
</para>
</listitem></varlistentry>