diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index edea19b89..b9db4c7f7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
2013-03-28
+
+ [matthew] - Upgrade to GCC-4.8.0. Fixes
+ #3312. Thanks to Pierre
+ Labastie for the patch on which this was based.
+
[matthew] - Upgrade to Linux-3.8.4. Fixes
#3310.
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index e22412f54..5b4914cb3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -76,9 +76,9 @@
-
+
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index d6a977d48..d858c9a98 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -18,6 +18,7 @@
+
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index bf8076d1b..ca4f4defe 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -131,11 +131,15 @@ cd ../gcc-build
--disable-multilib \
--disable-decimal-float \
--disable-threads \
- --disable-libmudflap \
- --disable-libssp \
+ --disable-libatomic \
--disable-libgomp \
+ --disable-libitm \
+ --disable-libmudflap \
--disable-libquadmath \
- --enable-languages=c \
+ --disable-libsanitizer \
+ --disable-libssp \
+ --disable-libstdc++-v3 \
+ --enable-languages=c,c++ \
--with-mpfr-include=$(pwd)/../gcc-&gcc-version;/mpfr/src \
--with-mpfr-lib=$(pwd)/mpfr/src/.libs
@@ -193,10 +197,14 @@ cd ../gcc-build
- --disable-decimal-float, --disable-threads, --disable-libmudflap, --disable-libssp, --disable-libgomp, --disable-libquadmath
+ --disable-decimal-float, --disable-threads,
+ --disable-libatomic, --disable-libgomp, --disable-libitm,
+ --disable-libmudflap, --disable-libquadmath, --disable-libsanitizer,
+ --disable-libssp, --disable-libstdc++-v3
These switches disable support for the decimal floating point
- extension, threading, libmudflap, libssp and libgomp and libquadmath
+ extension, threading, libatomic, libgomp, libitm, libmudflap,
+ libquadmath, libsanitizer, libssp and the C++ standard library
respectively. These features will fail to compile when building a
cross-compiler and are not necessary for the task of cross-compiling
the temporary libc.
@@ -212,10 +220,10 @@ cd ../gcc-build
- --enable-languages=c
+ --enable-languages=c,c++
- This option ensures that only the C compiler is built.
- This is the only language needed now.
+ This option ensures that only the C and C++ compilers are built.
+ These are the only languages needed now.
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 6e7631741..7ca724ce9 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -113,6 +113,7 @@ cd ../gcc-build
Now prepare GCC for compilation:
CC=$LFS_TGT-gcc \
+CXX=$LFS_TGT-g++ \
AR=$LFS_TGT-ar \
RANLIB=$LFS_TGT-ranlib \
../gcc-&gcc-version;/configure \
diff --git a/packages.ent b/packages.ent
index 596d256e4..1a2b1c512 100644
--- a/packages.ent
+++ b/packages.ent
@@ -166,10 +166,10 @@
-
-
+
+
-
+
@@ -318,6 +318,9 @@
+
+
+
diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml
index 74cb9e573..7dbee1f60 100644
--- a/prologue/hostreqs.xml
+++ b/prologue/hostreqs.xml
@@ -61,7 +61,7 @@
- Gcc-4.1.2 (Versions
+ GCC-4.1.2 (Versions
greater than &gcc-version; are not recommended as they have not
been tested)
@@ -170,6 +170,7 @@ if [ -e /usr/bin/awk ];
else echo "awk not found"; fi
gcc --version | head -n1
+g++ --version | head -n1
ldd --version | head -n1 | cut -d" " -f2- # glibc version
grep --version | head -n1
gzip --version | head -n1