Changeset 73ace20 for BOOK/cross-tools/multilib

Timestamp:

Oct 10, 2012, 6:42:21 PM (13 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (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 'master' of git.cross-lfs.org:cross-lfs

Location:

BOOK/cross-tools/multilib

Files:

• binutils.xml (modified) (2 diffs)
• eglibc-64bit.xml (modified) (2 diffs)
• eglibc.xml (modified) (1 diff)
• gcc-final.xml (modified) (1 diff)
• gcc-static.xml (modified) (1 diff)

BOOK/cross-tools/multilib/binutils.xml

@@ -28 +28 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='g'])"/>
@@ -42 +50 @@
   --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
   --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls --enable-shared \
-  --enable-64-bit-bfd</userinput></screen>
+  --disable-static --enable-64-bit-bfd</userinput></screen>
 
     <variablelist os="bd">

BOOK/cross-tools/multilib/eglibc-64bit.xml

@@ -65 +65 @@
     --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
     --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
+    --with-tls --enable-kernel=2.6.32 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
     --cache-file=config.cache</userinput></screen>
@@ -117 +117 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 

BOOK/cross-tools/multilib/eglibc.xml

@@ -60 +60 @@
     --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
+    --with-tls --enable-kernel=2.6.32 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
     --cache-file=config.cache</userinput></screen>

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

@@ -71 +71 @@
   --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
   --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
-  --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
-  --with-mpfr=/cross-tools --with-gmp=/cross-tools --enable-c99 \
-  --with-ppl=/cross-tools --with-cloog=/cross-tools \
-  --enable-long-long --enable-threads=posix</userinput></screen>
+  --enable-shared --disable-static --enable-languages=c,c++ \
+  --enable-__cxa_atexit --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+  --enable-c99 --with-ppl=/cross-tools --with-cloog=/cross-tools \
+  --enable-long-long --enable-threads=posix --enable-cloog-backend=isl</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -80 +80 @@
   --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
   --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
-  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-  --with-ppl=/cross-tools --with-cloog=/cross-tools \
+  --disable-shared --disable-static --with-mpfr=/cross-tools \
+  --with-gmp=/cross-tools --with-ppl=/cross-tools --with-cloog=/cross-tools \
   --without-headers --with-newlib --disable-decimal-float \
   --disable-libgomp --disable-libmudflap --disable-libssp \
-  --disable-threads --enable-languages=c</userinput></screen>
+  --disable-threads --enable-languages=c --enable-cloog-backend=isl</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"