Changeset b39aae0

Timestamp:

03/02/2022 01:04:45 PM (15 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.2, 11.2-rc1, 11.3, 11.3-rc1, bdubbs/gcc13, multilib, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/glibc-2.37, xry111/kcfg-revise, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008

Children:

6cad449

Parents:

fe09af0 (diff), 259b8e0 (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 tag 'xry111/lfs-next/for-trunk-20220302' into trunk

Files:

• chapter05/libstdc++.xml (modified) (2 diffs)
• chapter06/gcc-pass2.xml (modified) (5 diffs)
• chapter07/chapter07.xml (modified) (1 diff)
• chapter07/libstdc++-pass2.xml (deleted)
• chapter08/adjusting.xml (deleted)
• chapter08/gcc.xml (modified) (4 diffs)
• chapter08/iproute2.xml (modified) (1 diff)
• chapter08/tcl.xml (modified) (1 diff)

chapter05/libstdc++.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-tools-libstdcpp-pass1" role="wrap">
-  <?dbhtml filename="gcc-libstdc++-pass1.html"?>
+<sect1 id="ch-tools-libstdcpp" role="wrap">
+  <?dbhtml filename="gcc-libstdc++.html"?>
 
   <sect1info condition="script">
@@ -15 +15 @@
   </sect1info>
 
-  <title>Libstdc++ from GCC-&gcc-version;, Pass 1</title>
+  <title>Libstdc++ from GCC-&gcc-version;</title>
 
-  <indexterm zone="ch-tools-libstdcpp-pass1">
+  <indexterm zone="ch-tools-libstdcpp">
     <primary sortas="a-GCC">GCC</primary>
     <secondary>tools, libstdc++ pass 1</secondary>

chapter06/gcc-pass2.xml

@@ -63 +63 @@
   ;;
 esac</userinput></screen>
-<!--
-    <para>Fix an issue with GCC-10.1 when building with a cross
-    compiler:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&gcc-cross-patch;</userinput></screen>
--->
+    <!-- https://gcc.gnu.org/PR100017 -->
+    <para>Fix an issue causing failure cross-compiling libstdc++:</para>
+
+<screen><userinput remap="pre">sed 's/gnu++17/&amp; -nostdinc++/' \
+    -i libstdc++-v3/src/c++17/Makefile.in</userinput></screen>
+
+    <para>Override the building rule of libgcc and libstdc++ headers, to
+    allow building these libraries with POSIX threads support:</para>
+
+<screen><userinput remap="pre">sed '/thread_header =/s/@.*@/gthr-posix.h/' \
+    -i libgcc/Makefile.in libstdc++-v3/include/Makefile.in</userinput></screen>
+
     <para>Create a separate build directory again:</para>
 
 <screen><userinput remap="pre">mkdir -v build
 cd       build</userinput></screen>
-
-    <para>Create a symlink that allows libgcc to be built with posix threads
-    support:</para>
-
-<screen><userinput remap="pre">mkdir -pv $LFS_TGT/libgcc
-ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></screen>
 
     <para>Before starting to build GCC, remember to unset any environment
@@ -88 +89 @@
     --build=$(../config.guess)                     \
     --host=$LFS_TGT                                \
+    --target=$LFS_TGT                              \
+    LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc      \
     --prefix=/usr                                  \
-    CC_FOR_TARGET=$LFS_TGT-gcc                     \
     --with-build-sysroot=$LFS                      \
     --enable-initfini-array                        \
@@ -100 +102 @@
     --disable-libssp                               \
     --disable-libvtv                               \
-    --disable-libstdcxx                            \
     --enable-languages=c,c++</userinput></screen>
 
@@ -107 +108 @@
 
       <varlistentry>
-        <term><parameter>-with-build-sysroot=$LFS</parameter></term>
+        <term><parameter>--with-build-sysroot=$LFS</parameter></term>
         <listitem>
           <para>Normally, using <parameter>--host</parameter> ensures that
@@ -116 +117 @@
           needed to have them find the needed files in <filename
           class="directory">$LFS</filename>, and not on the host.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--target=$LFS_TGT</parameter></term>
+        <listitem>
+          <para>As we are cross-compiling GCC, it's impossible to build
+          target libraries (<filename class="libraryfile">libgcc</filename>
+          and <filename class="libraryfile">libstdc++</filename>) with the
+          compiled GCC binaries because these binaries won't run on the
+          host distro.  GCC building system will attempt to use the
+          C and C++ compilers on the host distro as a workaround by default.
+          It's not supported to build GCC target libraries with a different
+          version of GCC, so using host compilers may cause building
+          failure.  This parameter ensures to build the libraries with GCC
+          pass 1 and prevent the issue.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>LDFLAGS_FOR_TARGET=...</parameter></term>
+        <listitem>
+          <para>Allow <filename class="libraryfile">libstdc++</filename> to
+          use shared <filename class="libraryfile">libgcc</filename> being
+          built in this pass, instead of the static version built in GCC
+          pass 1. This is needed for supporting C++ exception
+          handling.</para>
         </listitem>
       </varlistentry>

chapter07/chapter07.xml

@@ -18 +18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++-pass2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>

chapter08/gcc.xml

@@ -198 +198 @@
     some sanity checks:</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+<screen><userinput>echo 'int main(){}' &gt; dummy.c
+cc dummy.c -v -Wl,--verbose &amp;&gt; dummy.log
+readelf -l a.out | grep ': /lib'</userinput></screen>
+
+  <para>There should be no errors,
+  and the output of the last command will be (allowing for
+  platform-specific differences in the dynamic linker name):</para>
+
+<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
+
+  <para>Now make sure that we're setup to use the correct start files:</para>
+
+<screen><userinput>grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log</userinput></screen>
+
+  <para>The output of the last command should be:</para>
 
 <screen><computeroutput>/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crt1.o succeeded
@@ -233 +225 @@
   <filename class="directory">/usr/lib</filename> directory.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+  <para>Verify that the compiler is searching for the correct header
+  files:</para>
 
 <screen><userinput>grep -B4 '^ /usr/include' dummy.log</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+  <para>This command should return the following output:</para>
 
 <screen><computeroutput>#include &lt;...&gt; search starts here:
@@ -252 +241 @@
    different than the above, depending on your system architecture.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+  <para>Next, verify that the new linker is being used with the correct search paths:</para>
+
+<screen><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
+
+  <para>References to paths that have components with '-linux-gnu' should
+  be ignored, but otherwise the output of the last command should be:</para>
 
 <screen><computeroutput>SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib64")
@@ -285 +269 @@
 SEARCH_DIR("/usr/lib");</computeroutput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="adjusting.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
+  <para>Next make sure that we're using the correct libc:</para>
+
+<screen><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
+
+  <para>The output of the last command should be:</para>
+
+<screen><computeroutput>attempt to open /usr/lib/libc.so.6 succeeded</computeroutput></screen>
+
+  <para>Make sure GCC is using the correct dynamic linker:</para>
+
+<screen><userinput>grep found dummy.log</userinput></screen>
+
+  <para>The output of the last command should be (allowing for
+  platform-specific differences in dynamic linker name):</para>
+
+<screen><computeroutput>found ld-linux-x86-64.so.2 at /usr/lib/ld-linux-x86-64.so.2</computeroutput></screen>
+
+  <para>If the output does not appear as shown above or is not received
+  at all, then something is seriously wrong. Investigate and retrace the
+  steps to find out where the problem is and correct it. <!--The most likely
+  reason is that something went wrong with the specs file adjustment.--> Any
+  issues will need to be resolved before continuing with the process.</para>
+
+  <para>Once everything is working correctly, clean up the test files:</para>
+
+<screen><userinput>rm -v dummy.c a.out dummy.log</userinput></screen>
 
     <para>Finally, move a misplaced file:</para>

chapter08/iproute2.xml

@@ -62 +62 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make NETNS_RUN_DIR=/run/netns</userinput></screen>
 
     <para>This package does not have a working test suite.</para>

chapter08/tcl.xml

@@ -64 +64 @@
 cd unix
 ./configure --prefix=/usr           \
-            --mandir=/usr/share/man \
-            $([ "$(uname -m)" = x86_64 ] &amp;&amp; echo --enable-64bit)</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>$([ "$(uname -m)" = x86_64 ] &amp;&amp; echo --enable-64bit)</parameter></term>
-        <listitem>
-          <para>The construct <parameter>$(&lt;shell command&gt;)</parameter>
-          is replaced by the output of the shell command.  Here this output is
-          empty if running on a 32 bit machine, and is
-          <parameter>--enable-64bit</parameter> if running on a 64 bit machine.
-          </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+            --mandir=/usr/share/man</userinput></screen>
 
     <para>Build the package:</para>