Changeset 1218687 for chapter05

Timestamp:

07/23/2007 05:09:53 PM (17 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Children:

2b75709a

Parents:

8e6333e

Message:

Initial changes to build x86_64 natively. Build needs testing and, very likely, some adjusting.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/x86_64/BOOK@8229 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter05

Files:

• adjusting.xml (modified) (2 diffs)
• binutils-pass1.xml (modified) (2 diffs)
• binutils-pass2.xml (modified) (1 diff)
• gcc-pass1.xml (modified) (3 diffs)
• gcc-pass2.xml (modified) (3 diffs)

chapter05/adjusting.xml

@@ -49 +49 @@
 
 <!-- Ampersands are needed to allow copy and paste -->
-<screen><userinput>gcc -dumpspecs | sed 's@^/lib/ld-linux.so.2@/tools&amp;@g' \
+<screen><userinput>gcc -dumpspecs | sed 's@/lib/ld-linux-x86-64.so.2@/tools&amp;@g' \
   > `dirname $(gcc -print-libgcc-file-name)`/specs</userinput></screen>
 
@@ -85 +85 @@
 
 <screen><computeroutput>[Requesting program interpreter:
-    /tools/lib/ld-linux.so.2]</computeroutput></screen>
+    /tools/lib/ld-linux-x86-64.so.2]</computeroutput></screen>
 
     <para>Note that <filename class="directory">/tools/lib</filename>

chapter05/binutils-pass1.xml

@@ -61 +61 @@
 
 <screen><userinput>CC="gcc -B/usr/bin/" ../binutils-&binutils-version;/configure \
-    --prefix=/tools --disable-nls</userinput></screen>
+    --prefix=/tools --disable-nls --disable-multilib</userinput></screen>
 
     <variablelist>
@@ -91 +91 @@
           <para>This disables internationalization as i18n is not needed for the
           temporary tools.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-multilib</parameter></term>
+        <listitem>
+          <para>We currently only want to build support for 64-bit libraries.</para>
         </listitem>
       </varlistentry>

chapter05/binutils-pass2.xml

@@ -46 +46 @@
 
 <screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
-    --disable-nls --with-lib-path=/tools/lib</userinput></screen>
+    --disable-nls --with-lib-path=/tools/lib \
+    --disable-multilib</userinput></screen>
 
     <variablelist>

chapter05/gcc-pass1.xml

@@ -38 +38 @@
     <title>Installation of GCC</title>
 
+    <para>Apply a small patch that changes the default location for
+    64-bit libraries:</para>
+
+<screen><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>
+
     <para>The GCC documentation recommends building GCC outside of the
     source directory in a dedicated build directory:</para>
@@ -48 +53 @@
 <screen><userinput>CC="gcc -B/usr/bin/" ../gcc-&gcc-version;/configure --prefix=/tools \
     --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c</userinput></screen>
+    --enable-languages=c --disable-multilib</userinput></screen>
 
     <variablelist>
@@ -91 +96 @@
         <listitem>
           <para>This option ensures that only the C compiler is built.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-multilib</parameter></term>
+        <listitem>
+          <para>We currently only want to build support for 64-bit libraries.</para>
         </listitem>
       </varlistentry>

chapter05/gcc-pass2.xml

@@ -87 +87 @@
     <para>Apply the following patch to change the location of GCC's default
     dynamic linker (typically <filename
-    class="libraryfile">ld-linux.so.2</filename>):</para>
-
-<screen><userinput>patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
+    class="libraryfile">ld-linux-x86-64.so.2</filename>):</para>
+
+<screen><userinput>patch -Np1 -i ../&gcc-pure64-specs-patch;</userinput></screen>
 
     <para>The above patch also removes <filename
@@ -117 +117 @@
     --enable-shared --enable-threads=posix \
     --enable-__cxa_atexit --enable-languages=c,c++ \
-    --disable-libstdcxx-pch</userinput></screen>
+    --disable-libstdcxx-pch --disable-multilib</userinput></screen>
 
     <variablelist>
@@ -200 +200 @@
 <screen><userinput>make install</userinput></screen>
 
+    <para>Since we're not building a multilib system, let's move some
+        installed libraries to a more generic location:</para>
+<screen><userinput>cp -va /tools/lib64/* /tools/lib
+rm -rvf /tools/lib64</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="adjusting.xml"