Changeset ee1a413


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

Files:
45 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r7d9f881 ree1a413  
    3939endif
    4040ifneq ($(ARCH), default)
    41   ifneq ($(ARCH), multilib)
    42     $(error ARCH must be either 'default' (default if unset) or 'multilib'.)
     41  ifneq ($(ARCH), ml_32)
     42    ifneq ($(ARCH), ml_x32)
     43      ifneq ($(ARCH), ml_all)
     44        $(error ARCH must be either 'default' (default if unset), 'ml_32', 'ml_x32' or 'ml_all'.)
     45      endif
     46    endif
    4347  endif
    4448endif

  • chapter01/askforhelp.xml

    r7d9f881 ree1a413  
    4040      <listitem>
    4141        <para>The version of the book being used (in this case
    42               <phrase arch="default" revision="sysv">&version;</phrase>
    43               <phrase arch="multilib" revision="sysv">&version;-multilib</phrase>
     42          <phrase arch="default" revision="sysv">&version;</phrase>
     43          <phrase arch="ml_32,ml_x32,ml_all" revision="sysv">&version;-multilib</phrase>
    4444          <phrase arch="default" revision="systemd">&versiond;</phrase>
    45           <phrase arch="multilib" revision="systemd">&versiond;-multilib</phrase>)</para>
     45          <phrase arch="ml_32,ml_x32,ml_all" revision="systemd">&versiond;-multilib</phrase>)</para>
    4646
    4747      </listitem>

  • chapter01/changelog.xml

    r7d9f881 ree1a413  
    1313  <para>This is version
    1414        <phrase arch="default" revision="sysv">&version;</phrase>
    15         <phrase arch="multilib" revision="sysv">&version;-multilib</phrase>
     15        <phrase arch="ml_32,ml_x32,ml_all" revision="sysv">&version;-multilib</phrase>
    1616        <phrase arch="default" revision="systemd">&versiond;</phrase>
    17         <phrase arch="multilib" revision="systemd">&versiond;-multilib</phrase>
     17        <phrase arch="ml_32,ml_x32,ml_all" revision="systemd">&versiond;-multilib</phrase>
    1818  of the Linux From Scratch book, dated
    1919  &releasedate;. If this book is more than six months old, a newer and better

  • chapter04/settingenviron.xml

    r7d9f881 ree1a413  
    4848EOF</userinput></screen>
    4949
    50 <screen arch="multilib"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
     50<screen arch="ml_32,ml_x32,ml_all"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
    5151<literal>set +h
    5252umask 022

  • chapter05/binutils-pass1.xml

    r7d9f881 ree1a413  
    8080             --disable-werror</userinput></screen>
    8181
    82     <screen arch="multilib"><userinput remap="configure">../configure --prefix=/tools \
     82    <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">lpath=/tools/lib</userinput>
     83<userinput remap="configure" arch="ml_32,ml_all">lpath="$lpath:/tools/lib32"</userinput>
     84<userinput remap="configure" arch="ml_x32,ml_all">lpath="$lpath:/tools/libx32"</userinput>
     85<userinput remap="configure">../configure --prefix=/tools \
    8386             --with-sysroot=$LFS                     \
    84              --with-lib-path=/tools/lib:/tools/lib32:/tools/libx32 \
     87             --with-lib-path=$lpath                  \
    8588             --target=$LFS_TGT                       \
    8689             --disable-nls                           \
    … …  
    159162    sanity of the toolchain:</para>
    160163
    161     <para arch="multilib">Create a symlink to ensure the sanity of
     164    <para arch="ml_32,ml_x32,ml_all">Create a symlink to ensure the sanity of
    162165    the toolchain:</para>
    163166
    … …  
    166169esac</userinput></screen>
    167170
    168 <screen arch="multilib"><userinput remap="install">mkdir -v /tools/lib &amp;&amp;
     171<screen arch="ml_32,ml_x32,ml_all"><userinput remap="install">mkdir -v /tools/lib &amp;&amp;
    169172ln -sv lib /tools/lib64</userinput></screen>
    170173

  • chapter05/binutils-pass2.xml

    r7d9f881 ree1a413  
    6161    --with-sysroot</userinput></screen>
    6262
    63 <screen arch="multilib"><userinput remap="configure">CC=$LFS_TGT-gcc                \
     63<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">lpath=/tools/lib</userinput>
     64<userinput remap="configure" arch="ml_32,ml_all">lpath="$lpath:/tools/lib32"</userinput>
     65<userinput remap="configure" arch="ml_x32,ml_all">lpath="$lpath:/tools/libx32"</userinput>
     66<userinput remap="configure">CC=$LFS_TGT-gcc                \
    6467AR=$LFS_TGT-ar                 \
    6568RANLIB=$LFS_TGT-ranlib         \
    … …  
    6871    --disable-nls              \
    6972    --disable-werror           \
    70     --with-lib-path=/tools/lib:/tools/lib32:/tools/libx32 \
     73    --with-lib-path=$lpath    \
    7174    --with-sysroot             \
    7275    --enable-64-bit-bfd        \
    … …  
    9699      </varlistentry>
    97100
    98       <varlistentry arch="multilib">
     101      <varlistentry arch="ml_32,ml_x32,ml_all">
    99102        <term><parameter>--with-lib-path=/tools/lib:...</parameter></term>
    100103        <listitem>
    … …  
    119122      </varlistentry>
    120123
    121       <varlistentry arch="multilib">
     124      <varlistentry arch="ml_32,ml_x32,ml_all">
    122125        <term><parameter>--enable-64-bit-bfd</parameter></term>
    123126        <listitem>
    … …  
    126129      </varlistentry>
    127130     
    128       <varlistentry arch="multilib">
     131      <varlistentry arch="ml_32,ml_x32,ml_all">
    129132        <term><parameter>--enable-multilib</parameter></term>
    130133        <listitem>
    … …  
    150153cp -v ld/ld-new /tools/bin</userinput></screen>
    151154
    152 <screen arch="multilib"><userinput remap="adjust">make -C ld clean
     155<screen arch="ml_all"><userinput remap="adjust">make -C ld clean
    153156make -C ld LIB_PATH=/usr/lib:/lib:/usr/lib32:/lib32:/usr/libx32:/libx32
     157cp -v ld/ld-new /tools/bin</userinput></screen>
     158<screen arch="ml_32"><userinput remap="adjust">make -C ld clean
     159make -C ld LIB_PATH=/usr/lib:/lib:/usr/lib32:/lib32
     160cp -v ld/ld-new /tools/bin</userinput></screen>
     161<screen arch="ml_x32"><userinput remap="adjust">make -C ld clean
     162make -C ld LIB_PATH=/usr/lib:/lib:/usr/libx32:/libx32
    154163cp -v ld/ld-new /tools/bin</userinput></screen>
    155164

  • 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>

  • 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

  • chapter05/glibc.xml

    r7d9f881 ree1a413  
    8383      </varlistentry>
    8484
    85       <varlistentry arch="multilib">
     85      <varlistentry arch="ml_32,ml_x32,ml_all">
    8686        <term><parameter>--enable-multi-arch</parameter></term>
    8787        <listitem>
    … …  
    192192  </sect2>
    193193
    194   <sect2 arch="multilib" role="installation">
     194  <sect2 arch="ml_32,ml_all" role="installation">
    195195    <title>Installation of Glibc 32-bit</title>
    196196
    … …  
    214214             --libexecdir=/tools/lib32          \
    215215             --with-headers=/tools/include      \
    216              --with-binutils=/tools/bin         \
     216             --with-binutils=/tools/bin</userinput></screen>
     217<!--                      \
    217218             libc_cv_forced_unwind=yes          \
    218              libc_cv_c_cleanup=yes</userinput></screen>
     219             libc_cv_c_cleanup=yes</userinput></screen> -->
    219220
    220221    <para>Now compile the 32-bit version of glibc:</para>
    … …  
    232233  </sect2>
    233234
    234   <sect2 arch="multilib" role="installation">
     235  <sect2 arch="ml_x32,ml_all" role="installation">
    235236    <title>Installation of Glibc x32-bit</title>
    236237
    … …  
    254255             --libexecdir=/tools/libx32         \
    255256             --with-headers=/tools/include      \
    256              --with-binutils=/tools/bin         \
     257             --with-binutils=/tools/bin</userinput></screen>
     258<!--                      \
    257259             libc_cv_forced_unwind=yes          \
    258              libc_cv_c_cleanup=yes</userinput></screen>
     260             libc_cv_c_cleanup=yes</userinput></screen> -->
    259261
    260262    <para>Now compile the x32-bit version of glibc:</para>

  • chapter05/ncurses.xml

    r7d9f881 ree1a413  
    113113  </sect2>
    114114
    115   <sect2 arch="multilib" role="installation">
     115  <sect2 arch="ml_32,ml_all" role="installation">
    116116    <title>Installation of Ncurses - 32 bit</title>
    117117
    … …  
    144144  </sect2>
    145145
    146   <sect2 arch="multilib" role="installation">
     146  <sect2 arch="ml_x32,ml_all" role="installation">
    147147    <title>Installation of Ncurses - x32 bit</title>
    148148

  • chapter05/stripping.xml

    r7d9f881 ree1a413  
    1919/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
    2020
    21 <screen arch="multilib"><userinput>strip --strip-debug /tools/lib{,{,x}32}/*
     21<screen arch="ml_32"><userinput>strip --strip-debug /tools/lib{,32}/*
     22/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
     23<screen arch="ml_x32"><userinput>strip --strip-debug /tools/lib{,x32}/*
     24/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
     25<screen arch="ml_all"><userinput>strip --strip-debug /tools/lib{,{,x}32}/*
    2226/usr/bin/strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
    2327
    … …  
    3943<screen arch="default"><userinput>find /tools/{lib,libexec} -name \*.la -delete</userinput></screen>
    4044
    41 <screen arch="multilib"><userinput>find /tools/{lib{,{,x}32},libexec} -name \*.la -delete</userinput></screen>
     45<screen arch="ml_32"><userinput>find /tools/{lib{,32},libexec} -name \*.la -delete</userinput></screen>
     46<screen arch="ml_x32"><userinput>find /tools/{lib{,x32},libexec} -name \*.la -delete</userinput></screen>
     47<screen arch="ml_all"><userinput>find /tools/{lib{,{,x}32},libexec} -name \*.la -delete</userinput></screen>
    4248
    4349  <para>At this point, you should have at least 3 GB of free space in

  • chapter05/util-linux.xml

    r7d9f881 ree1a413  
    122122  </sect2>
    123123
    124   <sect2 arch="multilib" role="installation">
     124  <sect2 arch="ml_32,ml_all" role="installation">
    125125    <title>Installation of Util-Linux - 32 bit</title>
    126126
    … …  
    154154  </sect2>
    155155
    156   <sect2 arch="multilib" role="installation">
     156  <sect2 arch="ml_x32,ml_all" role="installation">
    157157    <title>Installation of Util-Linux - x32 bit</title>
    158158

  • chapter05/xz.xml

    r7d9f881 ree1a413  
    6464  </sect2>
    6565
    66   <sect2 arch="multilib" role="installation">
     66  <sect2 arch="ml_32,ml_all" role="installation">
    6767    <title>Installation of Xz - 32 bit</title>
    6868
    … …  
    9191  </sect2>
    9292
    93   <sect2 arch="multilib" role="installation">
     93  <sect2 arch="ml_x32,ml_all" role="installation">
    9494    <title>Installation of Xz - x32 bit</title>
    9595

  • chapter05/zlib.xml

    r7d9f881 ree1a413  
    66]>
    77
    8 <sect1 arch="multilib" id="ch-tools-zlib" role="wrap">
     8<sect1 arch="ml_32,ml_x32,ml_all" id="ch-tools-zlib" role="wrap">
    99  <?dbhtml filename="zlib.html"?>
    1010
    … …  
    6060  </sect2>
    6161
    62   <sect2 arch="multilib" role="installation">
     62  <sect2 arch="ml_32,ml_all" role="installation">
    6363    <title>Installation of Zlib - 32 bit</title>
    6464
    … …  
    8383  </sect2>
    8484
    85   <sect2 arch="multilib" role="installation">
     85  <sect2 arch="ml_x32,ml_all" role="installation">
    8686    <title>Installation of Zlib - x32 bit</title>
    8787

  • chapter06/acl.xml

    r7d9f881 ree1a413  
    8080  </sect2>
    8181
    82   <sect2 arch="multilib" role="installation">
     82  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     83 
     84  <sect2 arch="ml_32,ml_all" role="installation">
    8385    <title>Installation of Acl - 32-bit</title>
    8486
    … …  
    106108  </sect2>
    107109
    108   <sect2 arch="multilib" role="installation">
     110  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     111 
     112  <sect2 arch="ml_x32,ml_all" role="installation">
    109113    <title>Installation of Acl - x32-bit</title>
    110114

  • chapter06/attr.xml

    r7d9f881 ree1a413  
    7979  </sect2>
    8080
    81   <sect2 arch="multilib" role="installation">
     81  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     82 
     83  <sect2 arch="ml_32,ml_all" role="installation">
    8284    <title>Installation of Attr - 32-bit</title>
    8385
    … …  
    106108  </sect2>
    107109
    108   <sect2 arch="multilib" role="installation">
     110  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     111 
     112  <sect2 arch="ml_x32,ml_all" role="installation">
    109113    <title>Installation of Attr - x32-bit</title>
    110114

  • chapter06/bzip2.xml

    r7d9f881 ree1a413  
    9898  </sect2>
    9999
    100   <sect2 arch="multilib" role="installation">
     100  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     101 
     102  <sect2 arch="ml_32,ml_all" role="installation">
    101103    <title>Installation of Bzip2 - 32-bit</title>
    102104
    … …  
    122124  </sect2>
    123125
    124   <sect2 arch="multilib" role="installation">
     126  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     127 
     128  <sect2 arch="ml_x32,ml_all" role="installation">
    125129    <title>Installation of Bzip2 - x32-bit</title>
    126130

  • chapter06/chapter06.xml

    r7d9f881 ree1a413  
    2323  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="adjusting.xml"/>
    2424
    25   <!-- arch="multilib" only -->
     25  <!-- arch="ml_32,ml_x32,ml_all" only -->
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc-32.xml"/>
    2727

  • chapter06/createfiles.xml

    r7d9f881 ree1a413  
    4848
    4949ln -sv bash /bin/sh</userinput></screen>
    50 <screen arch="multilib"><userinput>ln -sv /tools/bin/{bash,cat,chmod,dd,echo,ln,mkdir,pwd,rm,stty,touch} /bin
     50<screen arch="ml_32,ml_x32,ml_all"><userinput>ln -sv /tools/bin/{bash,cat,chmod,dd,echo,ln,mkdir,pwd,rm,stty,touch} /bin
    5151ln -sv /tools/bin/{env,install,perl,printf}         /usr/bin
    52 for lib in lib{,32,x32}; do
     52for lib in lib{</userinput><userinput arch="ml_32,ml_all">,32</userinput><userinput arch="ml_x32,ml_all">,x32</userinput><userinput>}; do
    5353  ln -sv /tools/$lib/libgcc_s.so{,.1}               /usr/$lib
    5454  ln -sv /tools/$lib/libstdc++.{a,so{,.6}}          /usr/$lib
    5555done
    56 ln -sv /usr/libx32 /
    57 
    58 install -vdm755 /usr/lib{,32,x32}/pkgconfig
     56</userinput><userinput arch="ml_x32,ml_all">ln -sv /usr/libx32 /</userinput><userinput>
     57install -vdm755 /usr/lib{</userinput><userinput arch="ml_32,ml_all">,32</userinput><userinput arch="ml_x32,ml_all">,x32</userinput><userinput>}/pkgconfig
    5958
    6059ln -sv bash /bin/sh</userinput></screen>

  • chapter06/creatingdirs.xml

    r7d9f881 ree1a413  
    3232ln -sv /run/lock /var/lock
    3333mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput></screen>
    34 <screen arch="multilib"><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig,ld.so.conf.d},home,lib/firmware,mnt,opt}
     34<screen arch="ml_32,ml_x32,ml_all"><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig,ld.so.conf.d},home,lib/firmware,mnt,opt}
    3535mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
    3636install -dv -m 0750 /root
    … …  
    4545ln -sv /run /var/run
    4646ln -sv /run/lock /var/lock
    47 mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}
    48 mkdir -pv /usr/lib{,x}32</userinput></screen>
     47mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput>
     48<userinput arch="ml_32,ml_all">mkdir -pv /usr/lib32</userinput>
     49<userinput arch="ml_x32,ml_all">mkdir -pv /usr/libx32</userinput></screen>
    4950
    5051  <para>Directories are, by default, created with permission mode 755, but

  • chapter06/eudev.xml

    r7d9f881 ree1a413  
    107107  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
    108108 
    109   <sect2 arch="multilib" role="installation">
     109  <sect2 arch="ml_32,ml_all" role="installation">
    110110    <title>Installation of Eudev - 32-bit</title>
    111111
    … …  
    144144  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
    145145 
    146   <sect2 arch="multilib" role="installation">
     146  <sect2 arch="ml_x32,ml_all" role="installation">
    147147    <title>Installation of Eudev - x32-bit</title>
    148148

  • chapter06/expat.xml

    r7d9f881 ree1a413  
    7070  </sect2>
    7171
    72   <sect2 arch="multilib" role="installation">
     72  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     73 
     74  <sect2 arch="ml_32,ml_all" role="installation">
    7375    <title>Installation of Expat - 32-bit</title>
    7476
    … …  
    98100  </sect2>
    99101
    100   <sect2 arch="multilib" role="installation">
     102  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     103 
     104  <sect2 arch="ml_x32,ml_all" role="installation">
    101105    <title>Installation of Zlib - x32-bit</title>
    102106

  • chapter06/file.xml

    r7d9f881 ree1a413  
    6060  </sect2>
    6161
    62   <sect2 arch="multilib" role="installation">
     62  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     63 
     64  <sect2 arch="ml_32,ml_all" role="installation">
    6365    <title>Installation of File - 32-bit</title>
    6466
    … …  
    8688  </sect2>
    8789
    88   <sect2 arch="multilib" role="installation">
     90  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     91 
     92  <sect2 arch="ml_x32,ml_all" role="installation">
    8993    <title>Installation of File - x32-bit</title>
    9094

  • chapter06/gcc.xml

    r7d9f881 ree1a413  
    5252esac</userinput></screen>
    5353
    54     <para arch="multilib">Change the default directory name for 64-bit
     54    <para arch="ml_32,ml_x32,ml_all">Change the default directory name for 64-bit
    5555    libraries to <quote>lib</quote>:</para>
    5656
    57 <screen arch="multilib"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
     57<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
    5858    -i.orig gcc/config/i386/t-linux64
    5959cat &gt; gcc/config/i386/t-linux64 &lt;&lt;"EOF"
    … …  
    9191             --disable-libmpx         \
    9292             --with-system-zlib</userinput></screen>
    93 
    94 <screen arch="multilib"><userinput remap="configure">SED=sed                               \
     93<screen arch="ml_32"><userinput remap="configure">SED=sed                               \
    9594../configure --prefix=/usr                     \
    9695             --enable-languages=c,c++          \
    9796             --enable-multilib                 \
    98              --with-multilib-list=m32,m64,mx32 \
     97             --with-multilib-list=m32,m64      \
    9998             --disable-bootstrap               \
     99             --disable-libmpx                  \
     100             --with-system-zlib</userinput></screen>
     101<screen arch="ml_x32"><userinput remap="configure">SED=sed                               \
     102../configure --prefix=/usr                     \
     103             --enable-languages=c,c++          \
     104             --enable-multilib                 \
     105             --with-multilib-list=mx32,m64     \
     106             --disable-bootstrap               \
     107             --disable-libmpx                  \
     108             --with-system-zlib</userinput></screen>
     109<screen arch="ml_all"><userinput remap="configure">SED=sed                               \
     110../configure --prefix=/usr                     \
     111             --enable-languages=c,c++          \
     112             --enable-multilib                 \
     113             --with-multilib-list=m32,mx32,m64 \
     114             --disable-bootstrap               \
     115             --disable-libmpx                  \
    100116             --with-system-zlib</userinput></screen>
    101117

  • chapter06/glibc-32.xml

    r7d9f881 ree1a413  
    66]>
    77
    8 <sect1 arch="multilib" id="ch-system-glibc-32" role="wrap">
     8<sect1 arch="ml_32,ml_x32,ml_all" id="ch-system-glibc-32" role="wrap">
    99  <?dbhtml filename="glibc-32.html"?>
    1010
    … …  
    4141  </sect2>
    4242-->
    43   <sect2 role="installation">
     43
     44  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     45 
     46  <sect2 arch="ml_32,ml_all" role="installation">
    4447    <title>Installation of Glibc - 32-bit</title>
    4548
    … …  
    98101  </sect2>
    99102
    100   <sect2>
     103  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     104 
     105  <sect2 arch="ml_x32,ml_all" role="installation">
    101106    <title>Glibc - x32-bit</title>
    102107

  • chapter06/gmp.xml

    r7d9f881 ree1a413  
    122122
    123123  <!-- ~~~~~ m32 ~~~~~ -->
    124   <sect2 arch="multilib" role="installation">
     124  <sect2 arch="ml_32,ml_all" role="installation">
    125125    <title>Installation of GMP - 32-bit</title>
    126126
    … …  
    173173  </sect2>
    174174 
    175   <!-- ~~~~~ m32 ~~~~~ -->
    176   <sect2 arch="multilib" role="installation">
     175  <!-- ~~~~~ mx32 ~~~~~ -->
     176  <sect2 arch="ml_x32,ml_all" role="installation">
    177177    <title>Installation of GMP - x32-bit</title>
    178178

  • chapter06/kmod.xml

    r7d9f881 ree1a413  
    9898  </sect2>
    9999
    100   <sect2 arch="multilib" role="installation">
     100  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     101 
     102  <sect2 arch="ml_32,ml_all" role="installation">
    101103    <title>Installation of Kmod - 32-bit</title>
    102104
    … …  
    130132  </sect2>
    131133
    132 <sect2 arch="multilib" role="installation">
     134  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     135 
     136  <sect2 arch="ml_x32,ml_all" role="installation">
    133137    <title>Installation of Kmod - x32-bit</title>
    134138

  • chapter06/libcap.xml

    r7d9f881 ree1a413  
    9393  </sect2>
    9494
    95   <sect2 arch="multilib" role="installation">
     95  <sect2 arch="ml_32,ml_all" role="installation">
    9696    <title>Installation of Libcap - 32-bit</title>
    9797
    … …  
    112112  </sect2>
    113113
    114   <sect2 arch="multilib" role="installation">
     114  <sect2 arch="ml_x32,ml_all" role="installation">
    115115    <title>Installation of Libcap - x32-bit</title>
    116116

  • chapter06/libelf.xml

    r7d9f881 ree1a413  
    6464  </sect2>
    6565
    66   <sect2 arch="multilib" role="installation">
     66  <sect2 arch="ml_32,ml_all" role="installation">
    6767    <title>Installation of Libelf - 32-bit</title>
    6868
    … …  
    9191  </sect2>
    9292
    93   <sect2 arch="multilib" role="installation">
     93  <sect2 arch="ml_x32,ml_all" role="installation">
    9494    <title>Installation of Libelf - x32-bit</title>
    9595

  • chapter06/libffi.xml

    r7d9f881 ree1a413  
    9999  </sect2>
    100100
    101   <!-- ~~~~~ m32 ~~~~~ -->
    102   <sect2 arch="multilib" role="installation">
     101  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     102 
     103  <sect2 arch="ml_32,ml_all" role="installation">
    103104    <title>Installation of Libffi - 32-bit</title>
    104105
    … …  
    133134  </sect2>
    134135
    135   <!-- ~~~~~ mx32 ~~~~~ -->
    136   <sect2 arch="multilib" role="installation">
     136  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     137 
     138  <sect2 arch="ml_x32,ml_all" role="installation">
    137139    <title>Installation of Libffi - x32-bit</title>
    138140

  • chapter06/libtool.xml

    r7d9f881 ree1a413  
    7171  </sect2>
    7272
    73 
    74   <sect2 arch="multilib" role="installation">
     73  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     74 
     75  <sect2 arch="ml_32,ml_all" role="installation">
    7576    <title>Installation of Libtool - 32-bit</title>
    7677
    … …  
    9899  </sect2>
    99100
    100   <sect2 arch="multilib" role="installation">
     101  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     102 
     103  <sect2 arch="ml_x32,ml_all" role="installation">
    101104    <title>Installation of Libtool - x32-bit</title>
    102105

  • chapter06/ncurses.xml

    r7d9f881 ree1a413  
    5555            --enable-pc-files       \
    5656            --enable-widec</userinput></screen>
    57 <screen arch="multilib"><userinput remap="configure">./configure --prefix=/usr           \
     57<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">./configure --prefix=/usr           \
    5858            --mandir=/usr/share/man \
    5959            --with-shared           \
    … …  
    9797      </varlistentry>
    9898
    99       <varlistentry arch="multilib">
     99      <varlistentry arch="ml_32,ml_x32,ml_all">
    100100        <term><parameter>--with-pkg-config-libdir=/usr/lib/pkgconfig</parameter></term>
    101101        <listitem>
    … …  
    179179  </sect2>
    180180
    181   <sect2 arch="multilib" role="installation">
     181  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     182 
     183  <sect2 arch="ml_32,ml_all" role="installation">
    182184    <title>Installation of Ncurses - 32-bit</title>
    183185
    … …  
    234236  </sect2>
    235237
    236   <sect2 arch="multilib" role="installation">
     238  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     239 
     240  <sect2 arch="ml_x32,ml_all" role="installation">
    237241    <title>Installation of Ncurses - x32-bit</title>
    238242

  • chapter06/openssl.xml

    r7d9f881 ree1a413  
    7575  </sect2>
    7676
    77   <!-- ~~~~~ 32-bit ~~~~~ -->
    78   <sect2 arch="multilib" role="installation">
     77  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     78 
     79  <sect2 arch="ml_32,ml_all" role="installation">
    7980    <title>Installation of OpenSSL - 32-bit</title>
    8081
    … …  
    107108  </sect2>
    108109
    109   <!-- ~~~~~ x32-bit ~~~~~ -->
    110   <sect2 arch="multilib" role="installation">
     110  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     111 
     112  <sect2 arch="ml_x32,ml_all" role="installation">
    111113    <title>Installation of OpenSSL - x32-bit</title>
    112114

  • chapter06/readline.xml

    r7d9f881 ree1a413  
    9393  </sect2>
    9494
    95   <sect2 arch="multilib" role="installation">
     95  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     96 
     97  <sect2 arch="ml_32,ml_all" role="installation">
    9698    <title>Installation of Readline - 32-bit</title>
    9799
    … …  
    120122  </sect2>
    121123
    122   <sect2 arch="multilib" role="installation">
     124  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     125 
     126  <sect2 arch="ml_x32,ml_all" role="installation">
    123127    <title>Installation of Readline - x32-bit</title>
    124128

  • chapter06/revisedchroot.xml

    r7d9f881 ree1a413  
    6363  at this point. To remove them, run:</para>
    6464
    65 <screen arch="default"><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
    66 
    67 <screen arch="multilib"><userinput>find /usr/lib{,{,x}32} /usr/libexec -name \*.la -delete</userinput></screen>
     65  <screen arch="default"><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
     66 <screen arch="ml_32"><userinput>find /usr/lib{,32} /usr/libexec -name \*.la -delete</userinput></screen>
     67<screen arch="ml_x32"><userinput>find /usr/lib{,x32} /usr/libexec -name \*.la -delete</userinput></screen>
     68 <screen arch="ml_all"><userinput>find /usr/lib{,{,x}32} /usr/libexec -name \*.la -delete</userinput></screen>
    6869
    6970   <para>For more information about libtool archive files, see the <ulink

  • chapter06/strippingagain.xml

    r7d9f881 ree1a413  
    5757unset LIB save_lib save_usrlib</userinput></screen>
    5858
    59 <screen arch="multilib"><userinput>save_lib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so"
     59<screen arch="ml_32,ml_x32,ml_all"><userinput>save_lib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so"
    6060
    6161cd /lib
    … …  
    114114    -exec /tools/bin/strip --strip-all {} ';'</userinput></screen>
    115115
    116 <screen arch="multilib"><userinput>/tools/bin/find /usr/lib{,{,x}32} -type f -name \*.a \
     116<screen arch="ml_32,ml_x32,ml_all"><userinput>/tools/bin/find /usr/lib{,{,x}32} -type f -name \*.a \
    117117   -exec /tools/bin/strip --strip-debug {} ';'
    118118

  • chapter06/systemd.xml

    r7d9f881 ree1a413  
    213213<!-- ====== 32-bit ===== -->
    214214
    215   <sect2 arch="multilib" role="installation">
     215  <sect2 arch="ml_32,ml_all" role="installation">
    216216    <title>Installation of systemd - 32-bit</title>
    217217
    … …  
    281281<!-- ====== x32-bit ===== -->
    282282
    283   <sect2 arch="multilib" role="installation">
     283  <sect2 arch="ml_x32,ml_all" role="installation">
    284284    <title>Installation of systemd - x32-bit</title>
    285285

  • chapter06/util-linux.xml

    r7d9f881 ree1a413  
    5353  </sect2>
    5454
    55   <!-- ~~~~~~~~~~~~~~~~~~~~~ default ABI ~~~~~~~~~~~~~~~~~~~~~ -->
    5655  <sect2 role="installation">
    5756    <title>Installation of Util-linux</title>
    … …  
    123122  </sect2>
    124123
    125   <!-- ~~~~~~~~~~~~~~~~~~~~~ ABI 32-bit ~~~~~~~~~~~~~~~~~~~~~ -->
    126   <sect2 arch="multilib" role="installation">
     124  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     125 
     126  <sect2 arch="ml_32,ml_all" role="installation">
    127127    <title>Installation of Util-linux - 32-bit</title>
    128128
    … …  
    179179  </sect2>
    180180
    181   <!-- ~~~~~~~~~~~~~~~~~~~~~ ABI x32-bit ~~~~~~~~~~~~~~~~~~~~~ -->
    182   <sect2 arch="multilib" role="installation">
     181  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     182 
     183  <sect2 arch="ml_x32,ml_all" role="installation">
    183184    <title>Installation of Util-linux - x32-bit</title>
    184185

  • chapter06/xz.xml

    r7d9f881 ree1a413  
    6969  </sect2>
    7070
    71   <sect2 arch="multilib" role="installation">
     71  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     72 
     73  <sect2 arch="ml_32,ml_all" role="installation">
    7274    <title>Installation of Xz - 32-bit</title>
    7375
    … …  
    9698  </sect2>
    9799
    98   <sect2 arch="multilib" role="installation">
     100  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     101 
     102  <sect2 arch="ml_x32,ml_all" role="installation">
    99103    <title>Installation of Xz - x32-bit</title>
    100104

  • chapter06/zlib.xml

    r7d9f881 ree1a413  
    6868  </sect2>
    6969
    70   <sect2 arch="multilib" role="installation">
     70  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
     71 
     72  <sect2 arch="ml_32,ml_all" role="installation">
    7173    <title>Installation of Zlib - 32-bit</title>
    7274
    … …  
    9496  </sect2>
    9597
    96   <sect2 arch="multilib" role="installation">
     98  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
     99 
     100  <sect2 arch="ml_x32,ml_all" role="installation">
    97101    <title>Installation of Zlib - x32-bit</title>
    98102

  • chapter08/grub.xml

    r7d9f881 ree1a413  
    166166EOF</userinput></screen>
    167167
    168     <screen arch="multilib" revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
     168    <screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
    169169<literal># Begin /boot/grub/grub.cfg
    170170set default=0
    … …  
    179179EOF</userinput></screen>
    180180
    181     <screen arch="multilib" revision="systemd"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
     181    <screen arch="ml_32,ml_x32,ml_all" revision="systemd"><userinput>cat &gt; /boot/grub/grub.cfg &lt;&lt; "EOF"
    182182<literal># Begin /boot/grub/grub.cfg
    183183set default=0

  • chapter08/kernel.xml

    r7d9f881 ree1a413  
    238238<screen arch="default" revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;</userinput></screen>
    239239
    240 <screen arch="multilib" revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;-multilib</userinput></screen>
     240<screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&version;-multilib</userinput></screen>
    241241
    242242<screen arch="default" revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;</userinput></screen>
    243243
    244 <screen arch="multilib" revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;-multilib</userinput></screen>
     244<screen arch="ml_32,ml_x32,ml_all" revision="systemd"><userinput remap="install">cp -iv arch/x86/boot/bzImage /boot/vmlinuz-&linux-version;-lfs-&versiond;-multilib</userinput></screen>
    245245
    246246
    … …  
    354354        <phrase arch="default" revision="sysv">vmlinuz-&linux-version;-lfs-&version;,</phrase>
    355355        <phrase arch="default" revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;,</phrase>
    356         <phrase arch="multilib" revision="sysv">vmlinuz-&linux-version;-lfs-&version;-multilib,</phrase>
    357         <phrase arch="multilib" revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;-multilib,</phrase>
     356        <phrase arch="ml_32,ml_x32,ml_all" revision="sysv">vmlinuz-&linux-version;-lfs-&version;-multilib,</phrase>
     357        <phrase arch="ml_32,ml_x32,ml_all" revision="systemd">vmlinuz-&linux-version;-lfs-&versiond;-multilib,</phrase>
    358358        and System.map-&linux-version;</seg>
    359359        <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg>

  • chapter09/theend.xml

    r7d9f881 ree1a413  
    3737EOF</userinput></screen>
    3838
    39 <screen arch="multilib" revision="systemd"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
     39<screen arch="ml_32,ml_x32,ml_all" revision="systemd"><userinput>cat &gt; /etc/os-release &lt;&lt; "EOF"
    4040NAME="Linux From Scratch"
    4141VERSION="&versiond;"
    … …  
    5252
    5353<screen arch="default" revision="sysv"><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
    54 <screen arch="multilib" revision="sysv"><userinput>echo &version;-multilib &gt; /etc/lfs-release</userinput></screen>
     54<screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput>echo &version;-multilib &gt; /etc/lfs-release</userinput></screen>
    5555
    5656  <para revision="systemd">Creating the file
    … …  
    8080EOF</userinput></screen>
    8181
    82 <screen arch="multilib" revision="sysv"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
     82<screen arch="ml_32,ml_x32,ml_all" revision="sysv"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
    8383DISTRIB_ID="Linux From Scratch"
    8484DISTRIB_RELEASE="&version;-multilib"
    … …  
    8787EOF</userinput></screen>
    8888
    89 <screen arch="multilib" revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
     89<screen arch="ml_32,ml_x32,ml_all" revision="systemd"><userinput>cat &gt; /etc/lsb-release &lt;&lt; "EOF"
    9090DISTRIB_ID="Linux From Scratch"
    9191DISTRIB_RELEASE="&versiond;-multilib"

  • prologue/bookinfo.xml

    r7d9f881 ree1a413  
    1010  <subtitle arch="default" revision='sysv'>Version &version;</subtitle>
    1111  <subtitle arch="default" revision='systemd'>Version &versiond;</subtitle>
    12   <subtitle arch="multilib" revision='sysv'>Version &version;-multilib</subtitle>
    13   <subtitle arch="multilib" revision='systemd'>Version &versiond;-multilib</subtitle>
     12  <subtitle arch="ml_32,ml_x32,ml_all" revision='sysv'>Version &version;-multilib</subtitle>
     13  <subtitle arch="ml_32,ml_x32,ml_all" revision='systemd'>Version &versiond;-multilib</subtitle>
    1414
    1515  <authorgroup>
    … …  
    3333    </author>
    3434
    35     <author arch="multilib">
     35    <author arch="ml_32,ml_x32,ml_all">
    3636      <firstname>Editor: Thomas</firstname>
    3737      <surname>Trepl</surname>

  • prologue/multilib.xml

    r7d9f881 ree1a413  
    66]>
    77
    8 <sect1 arch="multilib" id="pre-multilib">
     8<sect1 arch="ml_32,ml_x32,ml_all" id="pre-multilib">
    99  <?dbhtml filename="multilib.html"?>
    1010
    1111  <title>About the Multilib Edition</title>
    1212
    13   <sect2><title>What is 'multilib'</title>
     13  <sect2><title>What is Multilib</title>
    1414
    1515    <para>Today, most systems in the x86 world have a word size of 64
    … …  
    2929  </sect2>
    3030
    31   <sect2><title>Why doing multilib?</title>
     31  <sect2><title>Why doing Multilib?</title>
    3232
    3333    <para>From a educational point of view, LFS in its 'native' form is
    … …  
    5555    </para>
    5656
    57     <para>This multilib edition of LFS goes a small step beyond and a
     57    <para>The multilib edition of LFS goes a small step beyond and a
    5858      small step back to what has been said in the previous section
    5959      when talking about target architectures. On one hand, the multilib
    … …  
    7272  </sect2>
    7373
    74   <sect2><title>Building a multilib system</title>
     74  <sect2><title>Building a Multilib System</title>
    7575
    7676    <para>Building a multilib system is not that much different from
    7777      building a system by using the 'native' LFS book. Beside some
    7878      tweaks here and there the most prominent difference is that
    79       multilib requires compiling many applications three times:
     79      multilib requires compiling some applications up to three times:
    8080      one for the primary 64-bit architecture,
    81       one for the minor 32-bit architecture (m32),
    82       and once again for the 32-bit architecture with 64-bit memory
    83       extensions (mx32).</para>
     81      one for the 32-bit architecture (m32),
     82      and once again for the 32-bit architecture with is 32-bit memory
     83      access and 64 bit instruction set (mx32).</para>
    8484
    8585    <para>Continue only if you and your system meets the following
Note: See TracChangeset for help on using the changeset viewer.