diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d9a4b74f0..d1b0752de 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
+
+ 2009-10-20
+
+
+ [matthew] Upgraded to Binutils-2.20. Fixes
+ #2505.
+
+
+
+
2009-10-12
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0a1054572..103dbebe4 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -34,9 +34,9 @@
-
+
@@ -222,6 +222,10 @@
coreutils-7.6-uname-1.patch
+
+ glibc-2.10.1-binutils-1.patch
+
+
gzip-1.3.13-zdiff-1.patch
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7dffd7e9e..2b094f174 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -98,6 +98,14 @@
+
+ Glibc Binutils Patch - &glibc-binutils-patch-size;:
+
+ Download:
+ MD5 sum: &glibc-binutils-patch-md5;
+
+
+
Grep Debian Patch - &grep-debian-patch-size;:
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index d83498b98..1f66d03dc 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -43,6 +43,11 @@
Installation of Glibc
+ Apply a patch so that Glibc will build against
+ Binutils-&binutils-version;:
+
+patch -Np1 -i ../&glibc-binutils-patch;
+
Fix an error in the constants that get passed to the futex system
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 3014adcda..19e693415 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -64,11 +64,6 @@ Ask your system administrator to create more.
rm -fv etc/standards.info
sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in
- Fix an issue that causes one of the tests to fail to compile against
- Glibc-&glibc-version;:
-
-sed -i -e 's/getline/get_line/' libiberty/testsuite/test-demangle.c
-
The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 726b2a167..128e86ee0 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -101,6 +101,11 @@ unset DL
sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
+ Apply a patch so that Glibc will build against
+ Binutils-&binutils-version;:
+
+patch -Np1 -i ../&glibc-binutils-patch;
+
Fix an error in one of the make check routines. Note that the escaped
newline in the second sed is required:
diff --git a/general.ent b/general.ent
index 54513ed81..06eedcc8b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/packages.ent b/packages.ent
index 25d93ad42..5cb9aa34a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -33,10 +33,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index c1c538eb3..69b70dc44 100644
--- a/patches.ent
+++ b/patches.ent
@@ -50,6 +50,11 @@
+
+
+
+
+