diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d31576932..fa74df214 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -82,9 +82,6 @@ -August 17th, 2003 [alex]: Moved the adjusting of the toolchain -from chapter 6 to the end of chapter 5. - August 17th, 2003 [alex]: Chapter 05 - From Bash to Perl: put text in between commands. Added a section on stripping unneeded symbols to decrease the size of the tools. diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index f21f931e8..7d8cd2951 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -36,59 +36,6 @@ &c5-perl; - -Re-adjusting the toolchain - - -Now that we have compiled all the necessary tools, it is time to -re-adjust our toolchain. We will set it up so that it will link any newly -compiled program against the new Glibc, which is the first thing to get -compiled in the next chapter. Basically, this is the reverse of what we did -in the "Locking in" stage in the beginning of this chapter. - -The first thing to do is to adjust the linker scripts. For this we -retained the binutils-build directory from the second -pass over Binutils. Do the following: - -cd binutils-build -make -C ld INSTALL=/stage1/bin/install install-data-local - -This installs the adjusted linker scripts. The linker scripts now contain -no mention of /stage1/lib. From now on every compiled -program will link only against the libraries in -/usr/lib and /lib. The extra -INSTALL=/stage1/bin/install is needed because the -Makefile created during the second pass still contains the reference to -/usr/bin/install, which we obviously haven't installed -yet. - -You can now remove the Binutils source and build directories. - -The next thing to do is to amend our GCC specs file so that it points to -the new dynamic linker. Just like earlier on, we use a sed to accomplish -this: - -CURRENTSPECFILE=/stage1/lib/gcc-lib/*/*/specs -sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \ -    -e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \ -    $CURRENTSPECFILE > newspecfile -mv newspecfile $CURRENTSPECFILE -unset CURRENTSPECFILE - -Again, cutting and pasting the above is recommended. And just like -before, it is a good idea to check the linker scripts and the specs file to -ensure the intended changes were actually made. - -Note that the linker scripts will still contain a reference to -/stage1/i686-pc-linux-gnu/lib. This is unavoidable, but -luckily does not present a problem. There are no libraries in that location -as all the temporary stage1 libraries are located in -/stage1/lib. - - - - - Stripping diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml index e1001d236..f302cd014 100644 --- a/chapter06/adjustingtoolchain.xml +++ b/chapter06/adjustingtoolchain.xml @@ -2,14 +2,49 @@ Adjusting toolchain -cd binutils-build -make -C ld INSTALL=/stage1/bin/install install-data-local +Now that we have compiled all the necessary tools, it is time to +re-adjust our toolchain. We will set it up so that it will link any newly +compiled program against the new Glibc. Basically, this is the reverse of +what we did in the "Locking in" stage in the beginning of chapter 5. -SPECFILE=/stage1/lib/gcc-lib/*/*/specs +The first thing to do is to adjust the linker scripts. For this we +retained the binutils-build +directory from the second pass over Binutils. Run the following: + +cd binutils-build +make -C ld INSTALL=/stage1/bin/install install-data-local + +This installs the adjusted linker scripts. The linker scripts contain +no mention of /stage1/lib anymore. +From now on every compiled program will link only +against the libraries in /usr/lib and +/lib. The extra +INSTALL=/stage1/bin/install is needed because the +Makefile created during the second pass still contains the reference to +/usr/bin/install, which we obviously haven't installed +yet. + +You can now remove the Binutils source and build directories. + +The next thing to do is to amend our GCC specs file so that it points +to the new dynamic linker. Just like earlier on, we use a sed to accomplish +this: + +SPECFILE=/stage1/lib/gcc-lib/*/*/specs sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \     -e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' $SPECFILE > XX mv XX $SPECFILE unset SPECFILE +Again, cutting and pasting the above is recommended. And just like +before, it is a good idea to check the linker scripts and the specs file o +ensure the intended changes were actually made. + +Note that the linker scripts will still contain a reference to +/stage1/i686-pc-linux-gnu/lib. This +is unavoidable, but luckily does not present a problem. There are no +libraries in that location as all the temporary stage1 libraries are +located in /stage1/lib. + diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 8c7683a94..d3843cbb2 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -14,6 +14,7 @@ &c6-kernel; &c6-manpages; &c6-glibc; +&c6-adjustingtoolchain; &c6-binutils; &c6-gcc; &c6-coreutils; diff --git a/index.xml b/index.xml index 28baa74d2..d7ac274e2 100644 --- a/index.xml +++ b/index.xml @@ -4,8 +4,8 @@ - - + +