Changeset 98e7ac4 for chapter06/adjusting.xml

Timestamp:

12/18/2016 03:14:26 PM (7 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

ed3be61

Parents:

be3d9f3

Message:

Update toolchain sanity checks to use values for x86_64.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11155 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter06/adjusting.xml (modified) (5 diffs)

chapter06/adjusting.xml

@@ -51 +51 @@
   platform-specific differences in dynamic linker name):</para>
 
-<screen os="c"><computeroutput>[Requesting program interpreter: /lib/ld-linux.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>
 
-  <note><para>On 64-bit systems the interpreter should be
-  /lib64/ld-linux-x86-64.so.2.</para></note>
+  <note><para>On 32-bit systems the interpreter should be
+  /lib/ld-linux.so.2.</para></note>
 
   <para os="d">Now make sure that we're setup to use the correct start files:</para>
@@ -65 +65 @@
   <para os="f">The output of the last command should be:</para>
 
-<screen><computeroutput>/usr/lib/crt1.o succeeded
-/usr/lib/crti.o succeeded
-/usr/lib/crtn.o succeeded</computeroutput></screen>
-
-   <note><para>On 64-bit systems, the path above will be
-   /usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib64/.  This
-   reduces to /usr/lib64 and /usr/lib64 is a symlink that points to
-   /usr/lib.</para></note>
+<screen><computeroutput>/usr/lib/../lib/crt1.o succeeded
+/usr/lib/../lib/crti.o succeeded
+/usr/lib/../lib/crtn.o succeeded</computeroutput></screen>
 
   <para os="g">Verify that the compiler is searching for the correct header
@@ -92 +87 @@
 
 <screen><computeroutput>SEARCH_DIR("/usr/lib")
-SEARCH_DIR("/lib");</computeroutput></screen>
+SEARCH_DIR("/lib")</computeroutput></screen>
 
   <para os="l">Next make sure that we're using the correct libc:</para>
@@ -98 +93 @@
 <screen os="m"><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
 
-  <para os="n">The output of the last command (allowing for a lib64 directory 
-  on 64-bit hosts) should be:</para>
+  <para os="n">The output of the last command should be:</para>
 
 <screen os="o"><computeroutput>attempt to open /lib/libc.so.6 succeeded</computeroutput></screen>
@@ -107 +101 @@
 <screen os="q"><userinput>grep found dummy.log</userinput></screen>
 
-  <para os="r"> The output of the last command should be (allowing for
-  platform-specific differences in dynamic linker name and a lib64 directory on
-  64-bit hosts):</para>
+  <para os="r">The output of the last command should be (allowing for
+  platform-specific differences in dynamic linker name):</para>
 
-<screen os="s"><computeroutput>found ld-linux.so.2 at /lib/ld-linux.so.2</computeroutput></screen>
+<screen os="s"><computeroutput>found ld-linux-x86-64.so.2 at /lib/ld-linux-x86-64.so.2</computeroutput></screen>
 
   <para os="t">If the output does not appear as shown above or is not received