Ticket #979: gcc-update.patch

File gcc-update.patch, 19.4 KB (added by chris@…, 9 years ago)

Book update patch, please verify

  • BOOK/cross-tools/common/gcc-final.xml 

    diff --git a/BOOK/cross-tools/common/gcc-final.xml b/BOOK/cross-tools/common/gcc-final.xml
index 453fc95..a35a7a9 100644
    a b  
    6767    --enable-threads=posix --disable-multilib \
    6868    --with-mpc=/cross-tools --with-mpfr=/cross-tools --with-gmp=/cross-tools \
    6969    --with-cloog=/cross-tools --with-isl=/cross-tools --with-system-zlib \
    70     --enable-checking=release --enable-libstdcxx-time</userinput></screen>
     70    --disable-isl-version-check --enable-checking=release --enable-libstdcxx-time</userinput></screen>
    7171
    7272    <variablelist os="bg">
    7373      <title>The meaning of the new configure options:</title>

  • BOOK/cross-tools/common/gcc-static.xml 

    diff --git a/BOOK/cross-tools/common/gcc-static.xml b/BOOK/cross-tools/common/gcc-static.xml
index 168caae..d779c6f 100644
    a b echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFI 
    7777    --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
    7878    --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
    7979    --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
    80     --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \
    81     --disable-libsanitizer --disable-libquadmath --disable-threads \
     80    --disable-libssp --disable-libatomic --disable-libitm \
     81    --disable-libsanitizer --disable-libquadmath --disable-libvtv \
     82    --disable-libcilkrts --disable-isl-version-check --disable-threads \
    8283    --disable-multilib --disable-target-zlib --with-system-zlib \
    8384    --enable-languages=c --enable-checking=release</userinput></screen>
    8485

  • BOOK/cross-tools/mips64-64/gcc-final.xml 

    diff --git a/BOOK/cross-tools/mips64-64/gcc-final.xml b/BOOK/cross-tools/mips64-64/gcc-final.xml
index 7f22786..67a5968 100644
    a b  
    6767    --enable-__cxa_atexit --enable-threads=posix \
    6868    --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
    6969    --with-gmp=/cross-tools --with-cloog=/cross-tools \
    70     --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
    71     --enable-libstdcxx-time --with-abi=64</userinput></screen>
     70    --with-isl=/cross-tools --with-system-zlib --disable-isl-version-check \
     71    --enable-checking=release --enable-libstdcxx-time --with-abi=64</userinput></screen>
    7272
    7373    <variablelist os="bg">
    7474      <title>The meaning of the new configure options:</title>

  • BOOK/cross-tools/mips64-64/gcc-static.xml 

    diff --git a/BOOK/cross-tools/mips64-64/gcc-static.xml b/BOOK/cross-tools/mips64-64/gcc-static.xml
index 85400f4..ab99a86 100644
    a b  
    7979    --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
    8080    --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
    8181    --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
    82     --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \
    83     --disable-libsanitizer --disable-libquadmath --disable-threads \
     82    --disable-libssp --disable-libatomic --disable-libitm \
     83    --disable-libsanitizer --disable-libquadmath --disable-libvtv \
     84    --disable-libcilkrts --disable-isl-version-check --disable-threads \
    8485    --disable-multilib --disable-target-zlib --with-system-zlib \
    8586    --enable-languages=c --enable-checking=release --with-abi=64</userinput></screen>
    8687

  • BOOK/cross-tools/multilib/gcc-final.xml 

    diff --git a/BOOK/cross-tools/multilib/gcc-final.xml b/BOOK/cross-tools/multilib/gcc-final.xml
index 90fcdf7..3dc57f9 100644
    a b  
    6666    --disable-nls --disable-static --enable-languages=c,c++ \
    6767    --enable-__cxa_atexit --enable-threads=posix --with-mpc=/cross-tools \
    6868    --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
    69     --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
    70     --enable-libstdcxx-time</userinput></screen>
     69    --with-isl=/cross-tools --with-system-zlib --disable-isl-version-check \
     70    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
    7171
    7272    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7373    href="../common/gcc-final.xml"

  • BOOK/cross-tools/multilib/gcc-static.xml 

    diff --git a/BOOK/cross-tools/multilib/gcc-static.xml b/BOOK/cross-tools/multilib/gcc-static.xml
index ccac72c..a3b72e7 100644
    a b  
    7777    --with-sysroot=${CLFS} --with-local-prefix=/tools \
    7878    --with-native-system-header-dir=/tools/include --disable-nls \
    7979    --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
    80     --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \
    81     --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \
     80    --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \
     81    --without-headers --with-newlib --disable-decimal-float --disable-libgomp \
    8282    --disable-libssp --disable-libatomic --disable-libitm \
    83     --disable-libsanitizer --disable-libquadmath --disable-threads \
    84     --disable-target-zlib --with-system-zlib --with-isl=/cross-tools \
     83    --disable-libsanitizer --disable-libquadmath --disable-libvtv \
     84    --disable-libcilkrts --disable-isl-version-check --disable-threads \
     85    --disable-target-zlib --with-system-zlib \
    8586    --enable-languages=c --enable-checking=release</userinput></screen>
    8687
    8788    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/64/gcc.xml 

    diff --git a/BOOK/final-system/64/gcc.xml b/BOOK/final-system/64/gcc.xml
index 44e8f8f..d8447f8 100644
    a b  
    139139    href="../common/gcc.xml"
    140140    xpointer="xpointer(//*[@os='z'])"/>
    141141
    142     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    143     href="../common/gcc.xml"
    144     xpointer="xpointer(//*[@os='aa'])"/>
    145 
    146     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    147     href="../common/gcc.xml"
    148     xpointer="xpointer(//*[@os='ab'])"/>
    149 
    150142  </sect2>
    151143
    152144  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/common/gcc.xml 

    diff --git a/BOOK/final-system/common/gcc.xml b/BOOK/final-system/common/gcc.xml
index bc8fdb8..0cf201f 100644
    a b LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \ 
    4949  ../gcc-&gcc-version;/configure --prefix=/usr \
    5050    --libexecdir=/usr/lib --enable-threads=posix \
    5151    --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ \
    52     --disable-multilib --disable-libstdcxx-pch \
     52    --disable-multilib --disable-libstdcxx-pch --enable-install-libiberty \
    5353    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
    5454
    5555    <variablelist os="i1">
    … … LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \ 
    101101
    102102<screen os="t"><userinput>make install</userinput></screen>
    103103
    104     <para os="u">Install the <filename class="headerfile">libiberty</filename> header
    105     file that is needed by some packages:</para>
    106 
    107 <screen os="v"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /usr/include</userinput></screen>
    108 
    109     <para os="w">Some packages expect the C preprocessor to be installed in the
     104    <para os="u">Some packages expect the C preprocessor to be installed in the
    110105    <filename class="directory">/lib</filename> directory.
    111106    To support those packages, create this symlink:</para>
    112107
    113 <screen os="x"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
     108<screen os="v"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
    114109
    115     <para os="y">Many packages use the name <command>cc</command> to call the C
     110    <para os="w">Many packages use the name <command>cc</command> to call the C
    116111    compiler. To satisfy those packages, create a symlink:</para>
    117112
    118 <screen os="z"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
     113<screen os="x"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
    119114
    120     <para os="aa">Finally, move a misplaced file:</para>
     115    <para os="y">Finally, move a misplaced file:</para>
    121116
    122 <screen os="ab"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
     117<screen os="z"><userinput>mv -v /usr/lib/libstdc++*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
    123118
    124119  </sect2>
    125120

  • BOOK/final-system/mips64/gcc.xml 

    diff --git a/BOOK/final-system/mips64/gcc.xml b/BOOK/final-system/mips64/gcc.xml
index d0265c5..01dbd57 100644
    a b LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib" \ 
    5555  ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
    5656    --libexecdir=/usr/lib64 --enable-threads=posix --enable-__cxa_atexit \
    5757    --with-abi=64 --enable-clocale=gnu --enable-languages=c,c++ \
    58     --disable-libstdcxx-pch --with-system-zlib --enable-checking=release \
    59     --enable-libstdcxx-time</userinput></screen>
     58    --disable-libstdcxx-pch --enable-install-libiberty --with-system-zlib \
     59    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
    6060
    6161   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6262    href="../common/gcc.xml"

  • BOOK/final-system/multilib/gcc.xml 

    diff --git a/BOOK/final-system/multilib/gcc.xml b/BOOK/final-system/multilib/gcc.xml
index b56b504..a059b1e 100644
    a b LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib" \ 
    5555  ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
    5656    --libexecdir=/usr/lib64 --enable-threads=posix --enable-__cxa_atexit \
    5757    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
    58     --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
     58    ---enable-install-libiberty -with-system-zlib --enable-checking=release \
     59    --enable-libstdcxx-time</userinput></screen>
    5960
    6061   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6162    href="../common/gcc.xml"

  • BOOK/final-system/ppc64/gcc.xml 

    diff --git a/BOOK/final-system/ppc64/gcc.xml b/BOOK/final-system/ppc64/gcc.xml
index 6969a8a..438207e 100644
    a b  
    133133    href="../multilib/gcc.xml"
    134134    xpointer="xpointer(//*[@os='z'])"/>
    135135
    136     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    137     href="../common/gcc.xml"
    138     xpointer="xpointer(//*[@os='aa'])"/>
    139 
    140     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    141     href="../common/gcc.xml"
    142     xpointer="xpointer(//*[@os='ab'])"/>
    143 
    144136  </sect2>
    145137
    146138  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/packages.ent 

    diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 051bf21..0c8b059 100644
    a b  
    159159<!ENTITY gawk-md5 "a2a26543ce410eb74bc4a508349ed09a">
    160160<!ENTITY gawk-home "&gnu-software;gawk">
    161161
    162 <!ENTITY gcc-version "4.8.3">
    163 <!ENTITY gcc-size "84,108 KB">
     162<!ENTITY gcc-version "4.9.2">
     163<!ENTITY gcc-size "87,924 KB">
    164164<!ENTITY gcc-url "ftp://gcc.gnu.org/pub/gcc/releases/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
    165 <!ENTITY gcc-md5 "7c60f24fab389f77af203d2516ee110f">
     165<!ENTITY gcc-md5 "4df8ee253b7f3863ad0b86359cd39c43">
    166166<!ENTITY gcc-home "http://gcc.gnu.org">
    167167
    168168<!ENTITY gdbm-version "1.11">

  • BOOK/temp-system/64/gcc.xml 

    diff --git a/BOOK/temp-system/64/gcc.xml b/BOOK/temp-system/64/gcc.xml
index 906357c..76168a6 100644
    a b  
    7575    --with-local-prefix=/tools --disable-multilib --disable-nls \
    7676    --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \
    7777    --with-native-system-header-dir=/tools/include --disable-libssp \
    78     --enable-checking=release --enable-libstdcxx-time</userinput></screen>
     78    ---enable-install-libiberty -enable-checking=release --enable-libstdcxx-time</userinput></screen>
    7979
    8080    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8181    href="../common/gcc.xml"
    … …  
    105105    href="../common/gcc.xml"
    106106    xpointer="xpointer(//*[@os='cp'])"/>
    107107
    108     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109     href="../common/gcc.xml"
    110     xpointer="xpointer(//*[@os='u'])"/>
    111 
    112     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113     href="../common/gcc.xml"
    114     xpointer="xpointer(//*[@os='cr'])"/>
    115 
    116108  </sect2>
    117109
    118110  <sect2 role="content">

  • BOOK/temp-system/common/gcc.xml 

    diff --git a/BOOK/temp-system/common/gcc.xml b/BOOK/temp-system/common/gcc.xml
index a8c0678..5e26e98 100644
    a b sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userin 
    7171<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
    7272    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
    7373    --with-local-prefix=/tools --disable-multilib --disable-nls \
    74     --enable-languages=c,c++ --disable-libstdcxx-pch \
    75     --with-system-zlib --with-native-system-header-dir=/tools/include \
    76     --disable-libssp --enable-checking=release --enable-libstdcxx-time</userinput></screen>
     74    --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \
     75    --with-native-system-header-dir=/tools/include --disable-libssp \
     76    --enable-install-libiberty --enable-checking=release --enable-libstdcxx-time</userinput></screen>
    7777
    7878    <variablelist os="cl">
    7979      <title>The meaning of the new configure option:</title>
    … … sed "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:/tools:/cross-tools:g" \ 
    105105
    106106<screen os="cp"><userinput>make install</userinput></screen>
    107107
    108     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109     href="../../final-system/common/gcc.xml"
    110     xpointer="xpointer(//*[@os='u'])"/>
    111 
    112 <screen os="cr"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /tools/include</userinput></screen>
    113 
    114108  </sect2>
    115109
    116110  <sect2 role="content">

  • BOOK/temp-system/mips64-64/gcc.xml 

    diff --git a/BOOK/temp-system/mips64-64/gcc.xml b/BOOK/temp-system/mips64-64/gcc.xml
index e898ccb..00499a3 100644
    a b  
    7373<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
    7474    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
    7575    --with-local-prefix=/tools --disable-nls --enable-languages=c,c++ \
    76     --disable-libstdcxx-pch --with-system-zlib \
     76    --disable-libstdcxx-pch --with-system-zlib --enable-install-libiberty \
    7777    --enable-checking=release --enable-libstdcxx-time \
    7878    --with-native-system-header-dir=/tools/include</userinput></screen>
    7979
    … …  
    105105    href="../common/gcc.xml"
    106106    xpointer="xpointer(//*[@os='cp'])"/>
    107107
    108     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109     href="../common/gcc.xml"
    110     xpointer="xpointer(//*[@os='u'])"/>
    111 
    112     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113     href="../common/gcc.xml"
    114     xpointer="xpointer(//*[@os='cr'])"/>
    115 
    116108  </sect2>
    117109
    118110  <sect2 role="content">

  • BOOK/temp-system/mips64/gcc.xml 

    diff --git a/BOOK/temp-system/mips64/gcc.xml b/BOOK/temp-system/mips64/gcc.xml
index cc9c8d2..55573e3 100644
    a b  
    7474    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    7575    --target=${CLFS_TARGET} --with-local-prefix=/tools --disable-nls \
    7676    --enable-languages=c,c++ --disable-libstdcxx-pch --with-abi=64 \
    77     --with-system-zlib --enable-checking=release --enable-libstdcxx-time \
    78     --with-native-system-header-dir=/tools/include</userinput></screen>
     77    --with-system-zlib --enable-install-libiberty --enable-checking=release \
     78    --enable-libstdcxx-time --with-native-system-header-dir=/tools/include</userinput></screen>
    7979
    8080    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8181    href="../multilib/gcc.xml"
    … …  
    105105    href="../common/gcc.xml"
    106106    xpointer="xpointer(//*[@os='cp'])"/>
    107107
    108     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109     href="../common/gcc.xml"
    110     xpointer="xpointer(//*[@os='u'])"/>
    111 
    112     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113     href="../common/gcc.xml"
    114     xpointer="xpointer(//*[@os='cr'])"/>
    115 
    116108  </sect2>
    117109
    118110  <sect2 role="content">

  • BOOK/temp-system/multilib/gcc.xml 

    diff --git a/BOOK/temp-system/multilib/gcc.xml b/BOOK/temp-system/multilib/gcc.xml
index 6af48fa..721083c 100644
    a b  
    7474    --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    7575    --target=${CLFS_TARGET} --with-local-prefix=/tools --disable-nls \
    7676    --enable-languages=c,c++ --disable-libstdcxx-pch \
    77     --with-system-zlib --with-native-system-header-dir=/tools/include \
     77    --with-system-zlib --enable-install-libiberty \
     78    --with-native-system-header-dir=/tools/include \
    7879    --disable-libssp --enable-libstdcxx-time --enable-checking=release</userinput></screen>
    7980
    8081    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    105106    href="../common/gcc.xml"
    106107    xpointer="xpointer(//*[@os='cp'])"/>
    107108
    108     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109     href="../common/gcc.xml"
    110     xpointer="xpointer(//*[@os='u'])"/>
    111 
    112     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113     href="../common/gcc.xml"
    114     xpointer="xpointer(//*[@os='cr'])"/>
    115 
    116109  </sect2>
    117110
    118111  <sect2 role="content">

  • BOOK/temp-system/ppc/gcc.xml 

    diff --git a/BOOK/temp-system/ppc/gcc.xml b/BOOK/temp-system/ppc/gcc.xml
index 236b2ea..36806a3 100644
    a b  
    102102    href="../common/gcc.xml"
    103103    xpointer="xpointer(//*[@os='cp'])"/>
    104104
    105     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    106     href="../common/gcc.xml"
    107     xpointer="xpointer(//*[@os='u'])"/>
    108 
    109     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    110     href="../common/gcc.xml"
    111     xpointer="xpointer(//*[@os='cr'])"/>
    112 
    113105  </sect2>
    114106
    115107  <sect2 role="content">

  • BOOK/temp-system/ppc64-64/gcc.xml 

    diff --git a/BOOK/temp-system/ppc64-64/gcc.xml b/BOOK/temp-system/ppc64-64/gcc.xml
index df4f9dd..8108c80 100644
    a b  
    7373<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
    7474    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
    7575    --with-local-prefix=/tools --disable-nls --enable-languages=c,c++ \
    76     --disable-libstdcxx-pch --with-system-zlib \
     76    --disable-libstdcxx-pch --with-system-zlib --enable-install-libiberty \
    7777    --with-native-system-header-dir=/tools/include --enable-checking=release \
    7878    --enable-libstdcxx-time</userinput></screen>
    7979
    … …  
    105105    href="../common/gcc.xml"
    106106    xpointer="xpointer(//*[@os='cp'])"/>
    107107
    108     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109     href="../common/gcc.xml"
    110     xpointer="xpointer(//*[@os='u'])"/>
    111 
    112     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113     href="../common/gcc.xml"
    114     xpointer="xpointer(//*[@os='cr'])"/>
    115 
    116108  </sect2>
    117109
    118110  <sect2 role="content">

  • BOOK/temp-system/ppc64/gcc.xml 

    diff --git a/BOOK/temp-system/ppc64/gcc.xml b/BOOK/temp-system/ppc64/gcc.xml
index 1138c92..d767839 100644
    a b  
    102102    href="../common/gcc.xml"
    103103    xpointer="xpointer(//*[@os='cp'])"/>
    104104
    105     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    106     href="../common/gcc.xml"
    107     xpointer="xpointer(//*[@os='u'])"/>
    108 
    109     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    110     href="../common/gcc.xml"
    111     xpointer="xpointer(//*[@os='cr'])"/>
    112 
    113105  </sect2>
    114106
    115107  <sect2 role="content">