Merge r10995, r10996, and r10997 from trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10998 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

3 files changed, 25 insertions, 23 deletions

diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 68e41c771..067ddac9f 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -55,23 +55,23 @@ cd       build</userinput></screen>
 
     <para>Next, prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">../configure                                        \
-      --prefix=/tools                               \
-      --host=$LFS_TGT                               \
-      --build=$(../glibc-&glibc-version;/scripts/config.guess) \
-      --disable-profile                             \
-      --enable-kernel=&min-kernel;                        \
-      --enable-obsolete-rpc                         \
-      --with-headers=/tools/include                 \
-      libc_cv_forced_unwind=yes                     \
-      libc_cv_ctors_header=yes                      \
+<screen><userinput remap="configure">../configure                             \
+      --prefix=/tools                    \
+      --host=$LFS_TGT                    \
+      --build=$(../scripts/config.guess) \
+      --disable-profile                  \
+      --enable-kernel=&min-kernel;             \
+      --enable-obsolete-rpc              \
+      --with-headers=/tools/include      \
+      libc_cv_forced_unwind=yes          \
+      libc_cv_ctors_header=yes           \
       libc_cv_c_cleanup=yes</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
-        <term><parameter>--host=$LFS_TGT, --build=$(../glibc-&glibc-version;/scripts/config.guess)</parameter></term>
+        <term><parameter>--host=$LFS_TGT, --build=$(../scripts/config.guess)</parameter></term>
         <listitem>
           <para>The combined effect of these switches is that Glibc's build system
           configures itself to cross-compile, using the cross-linker and
diff --git a/chapter05/toolchaintechnotes.xml b/chapter05/toolchaintechnotes.xml
index 36c07bad3..252ea5262 100644
--- a/chapter05/toolchaintechnotes.xml
+++ b/chapter05/toolchaintechnotes.xml
@@ -30,22 +30,24 @@
     name of the target triplet is to run the <command>config.guess</command>
     script that comes with the source for many packages. Unpack the Binutils
     sources and run the script: <userinput>./config.guess</userinput> and note
-    the output. For example, for a modern 32-bit Intel processor the
-    output will likely be <emphasis>i686-pc-linux-gnu</emphasis>.</para>
+    the output. For example, for a 32-bit Intel processor the
+    output will be <emphasis>i686-pc-linux-gnu</emphasis>. On a 64-bit
+    system it will be <emphasis>x86_64-pc-linux-gnu</emphasis>.</para>
 
     <para>Also be aware of the name of the platform's dynamic linker, often
     referred to as the dynamic loader (not to be confused with the standard
     linker <command>ld</command> that is part of Binutils). The dynamic linker
     provided by Glibc finds and loads the shared libraries needed by a program,
     prepares the program to run, and then runs it. The name of the dynamic
-    linker for a 32-bit Intel machine will be
-    <filename class="libraryfile">ld-linux.so.2</filename>.
-    A sure-fire way to determine the name of the dynamic linker is to
-    inspect a random binary from the host system by running:
-    <userinput>readelf -l &lt;name of binary&gt; | grep interpreter</userinput>
-    and noting the output. The authoritative reference covering all platforms
-    is in the <filename>shlib-versions</filename> file in the root of the Glibc
-    source tree.</para>
+    linker for a 32-bit Intel machine will be <filename
+    class="libraryfile">ld-linux.so.2</filename> (<filename
+    class="libraryfile">ld-linux-x86-64.so.2</filename> for 64-bit systems).  A
+    sure-fire way to determine the name of the dynamic linker is to inspect a
+    random binary from the host system by running: <userinput>readelf -l
+    &lt;name of binary&gt; | grep interpreter</userinput> and noting the
+    output. The authoritative reference covering all platforms is in the
+    <filename>shlib-versions</filename> file in the root of the Glibc source
+    tree.</para>
   </note>
 
   <para>Some key technical points of how the <xref
diff --git a/general.ent b/general.ent
index 08aa61e35..17da56a2e 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20160129-systemd">
+<!ENTITY version         "20160131-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "January 29, 2016">
+<!ENTITY releasedate     "January 31, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->