aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05/lockingglibc.xml
diff options
context:
space:
mode:
Diffstat (limited to 'chapter05/lockingglibc.xml')
-rw-r--r--chapter05/lockingglibc.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml
index 94ab49e91..215e7567e 100644
--- a/chapter05/lockingglibc.xml
+++ b/chapter05/lockingglibc.xml
@@ -10,7 +10,7 @@ specs file.</para>
<para>First install the adjusted linker by running the following from within
the <filename class="directory">binutils-build</filename> directory:</para>
-<para><screen><userinput>make -C ld install</userinput></screen></para>
+<screen><userinput>make -C ld install</userinput></screen>
<para>The linker was adjusted a little while back, at the end of the first
pass of Binutils. From this point onwards everything will link <emphasis>only
@@ -22,11 +22,11 @@ Binutils build and source directories.</para>
<para>The next thing to do is to amend our GCC specs file so that it points
to the new dynamic linker. A simple sed will accomplish this:</para>
-<para><screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs
+<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs
sed -e 's@/lib/ld-linux.so.2@/tools/lib/ld-linux.so.2@g' \
&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > tempspecfile
mv tempspecfile $SPECFILE
-unset SPECFILE</userinput></screen></para>
+unset SPECFILE</userinput></screen>
<para>We recommend that you cut-and-paste the above rather than try and type it
all in. Or you can edit the specs file by hand if you want to: just replace any
@@ -44,15 +44,15 @@ because of GCC's "fixincludes" process which runs as part of the GCC build.
We'll explain more about this further on in this chapter. For now, run the
following commands to eliminate this possibility:</para>
-<para><screen><userinput>rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen></para>
+<screen><userinput>rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen>
<caution><para>It is imperative at this point to stop and ensure that the basic
functions (compiling and linking) of the new toolchain are working as expected.
For this we are going to perform a simple sanity check:</para>
-<para><screen><userinput>echo 'main(){}' > dummy.c
+<screen><userinput>echo 'main(){}' > dummy.c
gcc dummy.c
-readelf -l a.out | grep ': /tools'</userinput></screen></para>
+readelf -l a.out | grep ': /tools'</userinput></screen>
<para>If everything is working correctly, there should be no errors, and the
output of the last command will be:</para>
@@ -71,7 +71,7 @@ different.</para>
<para>Once you are satisfied that all is well, clean up the test files:</para>
-<para><screen><userinput>rm dummy.c a.out</userinput></screen></para>
+<screen><userinput>rm dummy.c a.out</userinput></screen>
</caution>
<para>This completes the installation of the self-contained toolchain, and it