Changeset ee1a413 for chapter05/binutils-pass2.xml

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

File:

• chapter05/binutils-pass2.xml (modified) (6 diffs)

chapter05/binutils-pass2.xml

@@ -61 +61 @@
     --with-sysroot</userinput></screen>
 
-<screen arch="multilib"><userinput remap="configure">CC=$LFS_TGT-gcc                \
+<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">lpath=/tools/lib</userinput>
+<userinput remap="configure" arch="ml_32,ml_all">lpath="$lpath:/tools/lib32"</userinput>
+<userinput remap="configure" arch="ml_x32,ml_all">lpath="$lpath:/tools/libx32"</userinput>
+<userinput remap="configure">CC=$LFS_TGT-gcc                \
 AR=$LFS_TGT-ar                 \
 RANLIB=$LFS_TGT-ranlib         \
@@ -68 +71 @@
     --disable-nls              \
     --disable-werror           \
-    --with-lib-path=/tools/lib:/tools/lib32:/tools/libx32 \
+    --with-lib-path=$lpath     \
     --with-sysroot             \
     --enable-64-bit-bfd        \
@@ -96 +99 @@
       </varlistentry>
 
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--with-lib-path=/tools/lib:...</parameter></term>
         <listitem>
@@ -119 +122 @@
       </varlistentry>
 
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--enable-64-bit-bfd</parameter></term>
         <listitem>
@@ -126 +129 @@
       </varlistentry>
       
-      <varlistentry arch="multilib">
+      <varlistentry arch="ml_32,ml_x32,ml_all">
         <term><parameter>--enable-multilib</parameter></term>
         <listitem>
@@ -150 +153 @@
 cp -v ld/ld-new /tools/bin</userinput></screen>
 
-<screen arch="multilib"><userinput remap="adjust">make -C ld clean
+<screen arch="ml_all"><userinput remap="adjust">make -C ld clean
 make -C ld LIB_PATH=/usr/lib:/lib:/usr/lib32:/lib32:/usr/libx32:/libx32
+cp -v ld/ld-new /tools/bin</userinput></screen>
+<screen arch="ml_32"><userinput remap="adjust">make -C ld clean
+make -C ld LIB_PATH=/usr/lib:/lib:/usr/lib32:/lib32
+cp -v ld/ld-new /tools/bin</userinput></screen>
+<screen arch="ml_x32"><userinput remap="adjust">make -C ld clean
+make -C ld LIB_PATH=/usr/lib:/lib:/usr/libx32:/libx32
 cp -v ld/ld-new /tools/bin</userinput></screen>