diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8ba0119d3..1bbf131b0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
-->
+
+ 2012-11-14
+
+
+ [matthew] - Upgrade to Binutils-2.23.1. Fixes
+ #3226.
+
+
+
+
2012-11-13
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a3ceaa244..2d089e845 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -37,9 +37,9 @@
-
+
Bison &bison-version;
@@ -257,6 +257,10 @@
bash-4.2-fixes-8.patch
+
+ binutils-2.22-build_fix-1.patch
+
+
gcc-4.7.1-startfiles_fix-1.patch
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 8df0518b1..5e3575348 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -26,14 +26,6 @@
-
- Binutils Build Fix Patch - &binutils-build-patch-size;:
-
- Download:
- MD5 sum: &binutils-build-patch-md5;
-
-
-
Bzip2 Documentation Patch - &bzip2-docs-patch-size;:
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 73e7948ac..c52e0255d 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -52,10 +52,6 @@
linker and assembler to determine which of their own features to
enable.
- Apply a patch to prevent a build failure when using compiler optimizations:
-
-patch -Np1 -i ../&binutils-build-patch;
-
The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 8a68ede3a..ca947482f 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -43,10 +43,6 @@
Installation of Binutils
- Apply a patch to prevent a build failure when using compiler optimizations:
-
-patch -Np1 -i ../&binutils-build-patch;
-
Create a separate build directory again:
mkdir -v ../binutils-build
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index b3f5d7675..44e8e4cba 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -64,10 +64,6 @@ Ask your system administrator to create more.
rm -fv etc/standards.info
sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in
- Apply a patch to prevent a build failure when using compiler optimizations:
-
-patch -Np1 -i ../&binutils-build-patch;
-
The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:
diff --git a/general.ent b/general.ent
index 1e0a1ad59..4cd98ea94 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/packages.ent b/packages.ent
index a072bbacd..deb58afbe 100644
--- a/packages.ent
+++ b/packages.ent
@@ -34,10 +34,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index da89ff1bd..89caa2fd3 100644
--- a/patches.ent
+++ b/patches.ent
@@ -7,11 +7,6 @@
-
-
-
-
-