Changeset fd48baa for chapter05/gcc-pass1.xml

Timestamp:

03/31/2021 10:41:34 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

1b7c90c2

Parents:

6702623

git-author:

Thomas Trepl <thomas@…> (04/07/2019 09:47:30 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:34 AM)

Message:

Change profiling attribute to enable selection of m32 and/or mx32. Fixes #4452.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11571 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter05/gcc-pass1.xml (modified) (7 diffs)

chapter05/gcc-pass1.xml

@@ -50 +50 @@
     automatically use them:</para>
 
-    <para arch="multilib">GCC now requires the GMP, ISL, MPFR, and MPC packages.
+    <para arch="ml_32,ml_x32,ml_all">GCC now requires the GMP, ISL, MPFR, and MPC packages.
     As these packages may not be included in your host distribution, they will
     be built with GCC.  Unpack each package into the GCC source directory and 
@@ -68 +68 @@
 tar -xf ../mpc-&mpc-version;.tar.gz
 mv -v mpc-&mpc-version; mpc</userinput></screen>
-<screen arch="multilib"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
 mv -v mpfr-&mpfr-version; mpfr
 tar -xf ../gmp-&gmp-version;.tar.xz
@@ -122 +122 @@
 esac</userinput></screen>
 
-<screen arch="multilib"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
     -i.orig gcc/config/i386/t-linux64
 cat > gcc/config/i386/t-linux64 &lt;&lt;"EOF"
@@ -150 +150 @@
     <!-- see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86724 -->
     <!-- Fix applied in ch5-gcc-pass{1,2}, ch6-gcc -->
-    <para arch="multilib">Fix an issue with isl-&isl-version;:</para>
-
-<screen arch="multilib"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
+    <para arch="ml_32,ml_x32,ml_all">Fix an issue with isl-&isl-version;:</para>
+
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
     -i gcc/graphite.h</userinput></screen>
 
@@ -186 +186 @@
     --enable-languages=c,c++</userinput></screen>
 
-<screen arch="multilib"><userinput remap="configure">../configure                                       \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">mlist="m64"</userinput>
+<userinput arch="ml_32,ml_all" remap="configure">mlist="$mlist,m32"</userinput>
+<userinput arch="ml_x32,ml_all" remap="configure">mlist="$mlist,mx32"</userinput>
+<userinput remap="configure">../configure                                       \
     --target=$LFS_TGT                              \
     --prefix=/tools                                \
@@ -198 +201 @@
     --disable-shared                               \
     --enable-multilib                              \
-    --with-multilib-list=m32,m64,mx32              \
+    --with-multilib-list=$mlist                    \
     --disable-decimal-float                        \
     --disable-threads                              \
@@ -287 +290 @@
       </varlistentry>
 
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--enable-multilib,
                          --with-multilib-list=m32,m64,mx32</parameter></term>