Index: BOOK/cross-tools/64/glibc.xml
===================================================================
--- BOOK/cross-tools/64/glibc.xml (revision e869c0f1ea19b7f453b1a1c0cf446c6308e41e72)
+++ BOOK/cross-tools/64/glibc.xml (revision 71cd9de45551ddff66984d1b226ec3cd78dc9448)
@@ -37,12 +37,4 @@
-
-
-
-
@@ -53,5 +45,5 @@
--disable-profile --enable-kernel=&glibc-kernel-version; \
--with-binutils=/cross-tools/bin --with-headers=/tools/include \
- --enable-obsolete-rpc --cache-file=config.cache
+ --enable-obsolete-rpc
@@ -93,8 +85,4 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='dg9'])"/>
-
-
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml (revision e869c0f1ea19b7f453b1a1c0cf446c6308e41e72)
+++ BOOK/cross-tools/common/glibc.xml (revision 71cd9de45551ddff66984d1b226ec3cd78dc9448)
@@ -35,9 +35,4 @@
xpointer="xpointer(//*[@os='f'])"/>
- Add the following to config.cache
- to disable ssp when building Glibc:
-
-echo "libc_cv_ssp=no" > config.cache
-
+ --enable-obsolete-rpc
@@ -129,11 +124,4 @@
-
- --cache-file=config.cache
-
- This tells Glibc to utilize a premade cache file.
-
-
-
Index: BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml (revision e869c0f1ea19b7f453b1a1c0cf446c6308e41e72)
+++ BOOK/cross-tools/mips64/glibc-n32.xml (revision 71cd9de45551ddff66984d1b226ec3cd78dc9448)
@@ -35,17 +35,8 @@
xpointer="xpointer(//*[@os='f'])"/>
-
-
-
-
Configure Glibc to install its 32-bit libraries into /tools/lib32:
-echo "libc_cv_rtlddir=/tools/lib32" >> config.cache
-echo "libc_cv_slibdir=/tools/lib32" >> config.cache
+echo "libc_cv_slibdir=/tools/lib32" >> config.cache
-
-
-
-
Configure Glibc to install its 64-bit libraries into /tools/lib64:
-echo "libc_cv_rtlddir=/tools/lib64" >> config.cache
-echo "libc_cv_slibdir=/tools/lib64" >> config.cache
+echo "libc_cv_slibdir=/tools/lib64" >> config.cache
-
-
-
-
@@ -53,5 +45,5 @@
--disable-profile --enable-kernel=&glibc-kernel-version; \
--with-binutils=/cross-tools/bin --with-headers=/tools/include \
- --enable-obsolete-rpc --cache-file=config.cache
+ --enable-obsolete-rpc
@@ -98,8 +90,4 @@
xpointer="xpointer(//*[@os='dg9'])"/>
-
-
Index: BOOK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/glibc.xml (revision e869c0f1ea19b7f453b1a1c0cf446c6308e41e72)
+++ BOOK/cross-tools/sparc64-64/glibc.xml (revision 71cd9de45551ddff66984d1b226ec3cd78dc9448)
@@ -34,12 +34,4 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='f'])"/>
-
-
-
-
-
+ Add the following variables to config.cache so they are set properly:
cat > config.cache << "EOF"
@@ -44,5 +42,4 @@
libc_cv_sparc64_tls=yes
libc_cv_gnu89_inline=yes
-libc_cv_ssp=no
EOF
Index: BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml (revision e869c0f1ea19b7f453b1a1c0cf446c6308e41e72)
+++ BOOK/final-system/mips64-64/glibc.xml (revision 71cd9de45551ddff66984d1b226ec3cd78dc9448)
@@ -53,4 +53,12 @@
href="../x86_64-64/glibc.xml"
xpointer="xpointer(//*[@os='l6'])"/>
+
+
+
+
Now we will force Glibc to build as 64-bit instead of the default
Index: BOOK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml (revision e869c0f1ea19b7f453b1a1c0cf446c6308e41e72)
+++ BOOK/final-system/multilib/glibc-64bit.xml (revision 71cd9de45551ddff66984d1b226ec3cd78dc9448)
@@ -46,6 +46,5 @@
/lib64:
-echo "libc_cv_rtlddir=/lib64" >> config.cache
-echo "libc_cv_slibdir=/lib64" >> config.cache
+echo "libc_cv_slibdir=/lib64" >> config.cache
+
+
+
+
- Now we can remove this symlink. We also need to correct the
- /usr/bin/ldd script - if you look at this, you will see it references
- not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
- is. The following sed will correct this:
+ Now we can remove this symlink:
- rm -v /lib/ld.so.1
-sed -i.bak '/RTLDLIST/s%/ld.so.1 /lib64%%' /usr/bin/ldd
-
- Check the script to make sure the sed worked correctly, then delete
- the backup.
-
- rm -v /usr/bin/ldd.bak
+ rm -v /lib/ld.so.1
+
+
+
+
/lib:
-echo "libc_cv_rtlddir=/lib" >> config.cache
-echo "libc_cv_slibdir=/lib" >> config.cache
+echo "libc_cv_slibdir=/lib" >> config.cache
+
+ Modify the ldd rewrite script to remove
+ lib64 and
+ libx32 from RTLDLIST.
+
+sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed
- Now we can remove this symlink. We also need to correct the
- /usr/bin/ldd script - if you look at this, you will see it references
- not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
- is. The following sed will correct this:
+ Now we can remove this symlink:
- rm -v /lib/ld-linux.so.2
-sed -i.bak '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd
-
- Check the script to make sure the sed worked correctly, then delete
- the backup.
-
- rm -v /usr/bin/ldd.bak
+ rm -v /lib/ld-linux.so.2
-
-
+
+
-
+