Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/cross-tools/common/gcc-static.xml

    r88ef769 r03e6a40  
    6969  --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
    7070  --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
    71   --disable-libmudflap --disable-libssp --disable-threads --disable-multilib \
    72   --disable-libatomic --disable-libitm --disable-libsanitizer \
    73   --disable-libquadmath --disable-target-libiberty --disable-target-zlib \
    74   --with-system-zlib --enable-cloog-backend=isl --disable-isl-version-check \
     71  --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \
     72  --disable-libsanitizer --disable-libquadmath --disable-threads \
     73  --disable-multilib --disable-target-zlib --with-system-zlib \
    7574  --enable-languages=c --enable-checking=release</userinput></screen>
    7675
    7776    <variablelist os="am">
    7877      <title>The meaning of the new configure options:</title>
    79 
    80       <varlistentry>
    81         <term><parameter>--with-sysroot=${CLFS}</parameter></term>
    82         <listitem>
    83           <para>Tells GCC to consider ${CLFS} as the root file system.</para>
    84         </listitem>
    85       </varlistentry>
    8678
    8779     <varlistentry>
     
    9688      </varlistentry>
    9789
    98 
    9990      <varlistentry>
    10091        <term><parameter>--with-native-system-headers-dir=/tools/include</parameter></term>
     
    10798
    10899      <varlistentry>
    109         <term><parameter>--disable-nls</parameter></term>
    110         <listitem>
    111           <para>This disables internationalization as i18n is not needed for the
    112           cross-compile tools.</para>
     100        <term><parameter>--disable-shared</parameter></term>
     101        <listitem>
     102          <para>This tells GCC not to create a shared library.</para>
    113103        </listitem>
    114104      </varlistentry>
     
    136126
    137127      <varlistentry>
    138         <term><parameter>--disable-libgomp</parameter></term>
    139         <listitem>
    140           <para>Disables the creation of runtime libraries used by GOMP.</para>
    141         </listitem>
    142       </varlistentry>
    143 
    144       <varlistentry>
    145         <term><parameter>--disable-libmudflap</parameter></term>
    146         <listitem>
    147           <para>Disables the creation of runtime libaries used by libmudflap.</para>
    148         </listitem>
    149       </varlistentry>
    150 
    151       <varlistentry>
    152         <term><parameter>--disable-libssp</parameter></term>
    153         <listitem>
    154           <para>Disables the use of Stack Smashing Protection for runtime libraries.</para>
     128        <term><parameter>--disable-lib*</parameter></term>
     129        <listitem>
     130          <para>These options prevent GCC from building a number of libraries
     131          that are not needed at this time.</para>
    155132        </listitem>
    156133      </varlistentry>
     
    167144
    168145      <varlistentry>
    169         <term><parameter>--disable-libatomic</parameter></term>
    170         <listitem>
    171           <para>The atomic library isn't needed at this time.</para>
    172         </listitem>
    173       </varlistentry>
    174 
    175       <varlistentry>
    176         <term><parameter>--disable-libitm</parameter></term>
    177         <listitem>
    178           <para>The itm library isn't neeeded at this tiem.</para>
    179         </listitem>
    180       </varlistentry>
    181 
    182       <varlistentry>
    183         <term><parameter>--disable-libsanitizer</parameter></term>
    184         <listitem>
    185           <para>The sanitizer library isn't needed at this time.</para>
    186         </listitem>
    187       </varlistentry>
    188 
    189       <varlistentry>
    190         <term><parameter>--disable-libquadmath</parameter></term>
    191         <listitem>
    192           <para>The quadmath library isn't needed at this time.</para>
     146        <term><parameter>--disable-target-zlib</parameter></term>
     147        <listitem>
     148          <para>This tells GCC stuff.</para>
     149        </listitem>
     150      </varlistentry>
     151
     152      <varlistentry>
     153        <term><parameter>--with-system-zlib</parameter></term>
     154        <listitem>
     155          <para>This tells GCC to link to the system-installed zlib instead
     156          of the one in its source tree.</para>
    193157        </listitem>
    194158      </varlistentry>
     
    231195<screen os="ar"><userinput>make install-gcc install-target-libgcc</userinput></screen>
    232196
     197    <para os="as">Copy <filename class="headerfile">libiberty.h</filename> to
     198    <filename class="directory">/tools/include</filename> directory:</para>
     199
     200<screen os="at"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /tools/include</userinput></screen>
     201
    233202  </sect2>
    234203
Note: See TracChangeset for help on using the changeset viewer.