From 3dfd95eaf1a35bb46914863362a93f53e8261e58 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Sat, 11 May 2019 04:39:07 +0000
Subject: [PATCH] Cleanup after the --disable-libmpx instruction removal in
 GCC. This required changes to GCC Pass 1 (CH5) and the main GCC page (CH6)

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11600 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/gcc-pass1.xml | 4 ++--
 chapter06/gcc.xml       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 1b364fd09..8758ac098 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -206,12 +206,12 @@ cd       build</userinput></screen>
 
       <varlistentry>
         <term><parameter>--disable-decimal-float, --disable-threads,
-        --disable-libatomic, --disable-libgomp, --disable-libmpx,
+              --disable-libatomic, --disable-libgomp, <!--- -disable-libmpx,-->
         --disable-libquadmath, --disable-libssp, --disable-libvtv,
         --disable-libstdcxx</parameter></term>
         <listitem>
           <para>These switches disable support for the decimal floating point
-          extension, threading, libatomic, libgomp, libmpx, libquadmath, libssp,
+          extension, threading, libatomic, libgomp, <!--libmpx, --> libquadmath, libssp,
           libvtv, 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.</para>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 659b4199d..eeb658f2a 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -80,16 +80,16 @@ cd       build</userinput></screen>
           path to /tools/bin/sed.</para>
         </listitem>
       </varlistentry>
- 
+      <!-- 
       <varlistentry>
-        <term><parameter>--disable-libmpx</parameter></term>
+        <term><parameter>- -disable-libmpx</parameter></term>
         <listitem>
           <para>This switch tells GCC to not build mpx (Memory Protection
           Extensions) that can cause problems on some processors. It has
           been removed from the next version of gcc.</para>
         </listitem>
       </varlistentry>
-
+      -->
       <varlistentry>
         <term><parameter>--with-system-zlib</parameter></term>
         <listitem>