Ignore:
Timestamp:
04/07/2019 09:47:30 AM (3 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1, multilib-before-cross
Children:
a23757b
Parents:
7d9f881
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:
1 edited

Legend:

Unmodified
Added
Removed
  • chapter05/gcc-pass1.xml

    r7d9f881 ree1a413  
    5050    automatically use them:</para>
    5151
    52     <para arch="multilib">GCC now requires the GMP, ISL, MPFR, and MPC packages.
     52    <para arch="ml_32,ml_x32,ml_all">GCC now requires the GMP, ISL, MPFR, and MPC packages.
    5353    As these packages may not be included in your host distribution, they will
    5454    be built with GCC.  Unpack each package into the GCC source directory and
     
    6868tar -xf ../mpc-&mpc-version;.tar.gz
    6969mv -v mpc-&mpc-version; mpc</userinput></screen>
    70 <screen arch="multilib"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
     70<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
    7171mv -v mpfr-&mpfr-version; mpfr
    7272tar -xf ../gmp-&gmp-version;.tar.xz
     
    122122esac</userinput></screen>
    123123
    124 <screen arch="multilib"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
     124<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
    125125    -i.orig gcc/config/i386/t-linux64
    126126cat > gcc/config/i386/t-linux64 &lt;&lt;"EOF"
     
    150150    <!-- see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86724 -->
    151151    <!-- Fix applied in ch5-gcc-pass{1,2}, ch6-gcc -->
    152     <para arch="multilib">Fix an issue with isl-&isl-version;:</para>
    153 
    154 <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;" \
     152    <para arch="ml_32,ml_x32,ml_all">Fix an issue with isl-&isl-version;:</para>
     153
     154<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;" \
    155155    -i gcc/graphite.h</userinput></screen>
    156156
     
    186186    --enable-languages=c,c++</userinput></screen>
    187187
    188 <screen arch="multilib"><userinput remap="configure">../configure                                       \
     188<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">mlist="m64"</userinput>
     189<userinput arch="ml_32,ml_all" remap="configure">mlist="$mlist,m32"</userinput>
     190<userinput arch="ml_x32,ml_all" remap="configure">mlist="$mlist,mx32"</userinput>
     191<userinput remap="configure">../configure                                       \
    189192    --target=$LFS_TGT                              \
    190193    --prefix=/tools                                \
     
    198201    --disable-shared                               \
    199202    --enable-multilib                              \
    200     --with-multilib-list=m32,m64,mx32              \
     203    --with-multilib-list=$mlist                    \
    201204    --disable-decimal-float                        \
    202205    --disable-threads                              \
     
    287290      </varlistentry>
    288291
    289       <varlistentry arch="multilib">
     292      <varlistentry arch="ml_32,ml_x32,ml_all">
    290293        <term><parameter>--enable-multilib,
    291294                         --with-multilib-list=m32,m64,mx32</parameter></term>
Note: See TracChangeset for help on using the changeset viewer.