aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Huntwork <jhuntwork@linuxfromscratch.org>2007-07-25 16:34:35 +0000
committerJeremy Huntwork <jhuntwork@linuxfromscratch.org>2007-07-25 16:34:35 +0000
commitd05500f926a85b895af965c67bbb4e5a75309902 (patch)
tree365e226f983d3d0052265f9c57f6406ae3ad009d
parentf88b3c5ed9078d42b36b79251756980300378d49 (diff)
More accurate results for the sanity tests.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/x86_64/BOOK@8249 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml3
-rw-r--r--chapter05/adjusting.xml6
-rw-r--r--chapter06/gcc.xml6
-rw-r--r--chapter06/readjusting.xml4
4 files changed, 11 insertions, 8 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bc519e0de..d1e1d3c99 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,9 @@
<para>2007-07-25</para>
<itemizedlist>
<listitem>
+ <para>[jhuntwork] - More accurate results for the sanity tests.</para>
+ </listitem>
+ <listitem>
<para>[jhuntwork] - Create the /tools/lib64 symlink after installing binutils.</para>
</listitem>
</itemizedlist>
diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index c6ed6e609..6bbe44baa 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -36,8 +36,8 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
<para>For the sake of accuracy, it is recommended to use a copy-and-paste
method when issuing the following command. Be sure to visually inspect the
- specs file and verify that all occurrences of <quote>/lib/ld-linux-x86-64.so.2</quote>
- have been replaced with <quote>/tools/lib/ld-linux-x86-64.so.2</quote>:</para>
+ specs file and verify that all occurrences of <quote>/lib64/ld-linux-x86-64.so.2</quote>
+ have been replaced with <quote>/tools/lib64/ld-linux-x86-64.so.2</quote>:</para>
<important>
<para>If working on a platform where the name of the dynamic linker is
@@ -84,7 +84,7 @@ readelf -l a.out | grep ': /tools'</userinput></screen>
and the output of the last command will be of the form:</para>
<screen><computeroutput>[Requesting program interpreter:
- /tools/lib/ld-linux-x86-64.so.2]</computeroutput></screen>
+ /tools/lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
<para>Note that <filename class="directory">/tools/lib</filename>
appears as the prefix of the dynamic linker.</para>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index ddb4d4c46..a7ffb38f8 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -154,9 +154,9 @@ cd ../gcc-build</userinput></screen>
href="readjusting.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen><computeroutput>/usr/lib/gcc/x86_64-unknown-linux-gnu/&gcc-version;/../../../crt1.o succeeded
-/usr/lib/gcc/x86_64-unknown-linux-gnu/&gcc-version;/../../../crti.o succeeded
-/usr/lib/gcc/x86_64-unknown-linux-gnu/&gcc-version;/../../../crtn.o succeeded</computeroutput></screen>
+<screen><computeroutput>/usr/lib/gcc/x86_64-unknown-linux-gnu/&gcc-version;/../../../../lib64/crt1.o succeeded
+/usr/lib/gcc/x86_64-unknown-linux-gnu/&gcc-version;/../../../../lib64/crti.o succeeded
+/usr/lib/gcc/x86_64-unknown-linux-gnu/&gcc-version;/../../../../lib64/crtn.o succeeded</computeroutput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="readjusting.xml"
diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml
index 747f63646..87e9c1cca 100644
--- a/chapter06/readjusting.xml
+++ b/chapter06/readjusting.xml
@@ -66,7 +66,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
and the output of the last command will be (allowing for
platform-specific differences in dynamic linker name):</para>
-<screen os="c"><computeroutput>[Requesting program interpreter: /lib/ld-linux-x86-64.so.2]</computeroutput></screen>
+<screen os="c"><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
<para>Note that <filename class="directory">/lib</filename> is now
the prefix of our dynamic linker.</para>
@@ -120,7 +120,7 @@ SEARCH_DIR("/lib");</computeroutput></screen>
and the output of the last command will be (allowing for
platform-specific differences in dynamic linker name):</para>
-<screen os="s"><computeroutput>found ld-linux-x86-64.so.2 at /lib/ld-linux-x86-64.so.2</computeroutput></screen>
+<screen os="s"><computeroutput>found ld-linux-x86-64.so.2 at /lib64/ld-linux-x86-64.so.2</computeroutput></screen>
<para os="t">If the output does not appear as shown above or is not received
at all, then something is seriously wrong. Investigate and retrace the