Clean up for removal of libmpx*

was r11458.

chapter06/bison.xml

@@ -56,12 +56,11 @@
 
     <!--para>There is a circular dependency between bison and flex with regard to
     the checks.  If desired, after installing flex in the next section, the
-<<<<<<< HEAD
     bison checks can be run with <command>make check</command>.  Three
     tests related to lalr1.cc fail for unknown reasons.</para-->
     <para>在考虑测试的情况下， bison 和 flex 之间存在循环依赖。
-		如果希望的话，可以在下一节安装 flex 后，
-		返回这里运行 <command>make check</command> 运行测试。</para>
+		如果希望的话，可以在下一节安装 flex 后，重新构建 bison，
+		再执行 <command>make check</command> 运行测试。</para>
 
     <para>安装该软件包：</para>
 

chapter06/strippingagain.xml

@@ -54,8 +54,7 @@ for LIB in $save_lib; do
 done    
 
 save_usrlib="libquadmath.so.&libquadmath-version; libstdc++.so.&libstdcpp-version;
-             libmpx.so.&libmpx-version; libmpxwrappers.so.&libmpxwrap-version; libitm.so.&libitm-version;
-             libatomic.so.&libatomic-version;" <!-- libcilkrts.so.&libcilkrts-version;-->
+             libitm.so.&libitm-version; libatomic.so.&libatomic-version;" <!-- libcilkrts.so.&libcilkrts-version;-->
 
 cd /usr/lib