Ignore:
Timestamp:
04/07/2019 09:47:30 AM (5 years ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib-10.1
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-pass2.xml

    r7d9f881 ree1a413  
    9494esac</userinput></screen>
    9595
    96     <para arch="multilib">Change the default directory name for 64-bit
     96    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for 64-bit
    9797    libraries to <quote>lib</quote>:</para>
    9898
    99 <screen arch="multilib"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
     99<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
    100100    -i.orig gcc/config/i386/t-linux64
    101101cat > gcc/config/i386/t-linux64 &lt;&lt;"EOF"
    … …  
    112112    required directory names:</para>
    113113
    114     <para arch="multilib">As in the first build of GCC it requires the GMP,
     114    <para arch="ml_32,ml_x32,ml_all">As in the first build of GCC it requires the GMP,
    115115    ISL, MPFR, and MPC packages. Unpack the tarballs and move them into the
    116116    required directory names:</para>
    … …  
    122122tar -xf ../mpc-&mpc-version;.tar.gz
    123123mv -v mpc-&mpc-version; mpc</userinput></screen>
    124 <screen arch="multilib"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
     124<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">tar -xf ../mpfr-&mpfr-version;.tar.xz
    125125mv -v mpfr-&mpfr-version; mpfr
    126126tar -xf ../gmp-&gmp-version;.tar.xz
    … …  
    132132
    133133    <!-- Following patch might be obsolete with gcc >= 8.2.1 -->
    134     <para arch="multilib">Fix an issue with isl-&isl-version;:</para>
    135 
    136 <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;" \
     134    <para arch="ml_32,ml_x32,ml_all">Fix an issue with isl-&isl-version;:</para>
     135
     136<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;" \
    137137    -i gcc/graphite.h</userinput></screen>
    138138
    … …  
    161161    --disable-libgomp</userinput></screen>
    162162
    163 <screen arch="multilib"><userinput remap="configure">CC=$LFS_TGT-gcc                                    \
     163<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">mlist="m64"</userinput>
     164<userinput arch="ml_32,ml_all" remap="configure">mlist="$mlist,m32"</userinput>
     165<userinput arch="ml_x32,ml_all" remap="configure">mlist="$mlist,mx32"</userinput>
     166<userinput remap="configure">CC=$LFS_TGT-gcc                                    \
    164167CXX=$LFS_TGT-g++                                   \
    165168AR=$LFS_TGT-ar                                     \
    … …  
    172175    --disable-libstdcxx-pch                        \
    173176    --enable-multilib                              \
    174     --with-multilib-list=m32,m64,mx32              \
     177    --with-multilib-list=$mlist                    \
    175178    --with-system-zlib                             \
    176179    --disable-bootstrap                            \
    … …  
    245248
    246249
    247     <para arch="multilib">Repeat the test for 32-bit:</para>
    248 
    249 <screen arch="multilib"><userinput>cc -m32 dummy.c
     250    <para arch="ml_32,ml_all">Repeat the test for 32-bit:</para>
     251
     252<screen arch="ml_32,ml_all"><userinput>cc -m32 dummy.c
    250253readelf -l a.out | grep ': /tools'</userinput></screen>
    251254
    252     <para arch="multilib">In this case, the output shoud be:</para>
    253 
    254 <screen arch="multilib"><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen>
    255 
    256     <para arch="multilib">Repeat the test for x32-bit:</para>
    257 
    258 <screen arch="multilib"><userinput>cc -mx32 dummy.c
     255    <para arch="ml_32,ml_all">In this case, the output shoud be:</para>
     256
     257<screen arch="ml_32,ml_all"><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen>
     258
     259    <para arch="ml_x32,ml_all">Repeat the test for x32-bit:</para>
     260
     261<screen arch="ml_x32,ml_all"><userinput>cc -mx32 dummy.c
    259262readelf -l a.out | grep ': /tools'</userinput></screen>
    260263
    261     <para arch="multilib">In this case, the output shoud be:</para>
    262 
    263 <screen arch="multilib"><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux-x32.so.2]</computeroutput></screen>
     264    <para arch="ml_x32,ml_all">In this case, the output shoud be:</para>
     265
     266<screen arch="ml_x32,ml_all"><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux-x32.so.2]</computeroutput></screen>
    264267
    265268    <para arch="default">Note that the dynamic linker will be
Note: See TracChangeset for help on using the changeset viewer.