# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1222181290 0
# Node ID fd4bf138f08fde05a60b5be0e6cde6b81bb645a7
# Parent  907d4ad06c0f9fbe8e661b0e4a5f1c71ef946da8
Bart De VOS pointed out that removing absolute paths from the libc linker scripts is plainly wrong.
It dates from dawn ages of the original crosstool code, and is not well explained. At that time, binutils might not understand the sysroot stuff, and it was necessary to remove absolute paths in that case.

 /trunk/scripts/build/libc/glibc.sh |   14     2    12     0 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff -r 907d4ad06c0f -r fd4bf138f08f scripts/build/libc/glibc.sh
--- a/scripts/build/libc/glibc.sh	Tue Sep 23 07:28:20 2008 +0000
+++ b/scripts/build/libc/glibc.sh	Tue Sep 23 14:48:10 2008 +0000
@@ -489,13 +489,7 @@
 
     # Fix problems in linker scripts.
     #
-    # 1. Remove absolute paths
-    # Any file in a list of known suspects that isn't a symlink is assumed to be a linker script.
-    # FIXME: test -h is not portable
-    # FIXME: probably need to check more files than just these three...
-    # Need to use sed instead of just assuming we know what's in libc.so because otherwise alpha breaks
-    #
-    # 2. Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html,
+    # Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html,
     # needed to fix gcc-3.2.3/glibc-2.3.2 targeting arm
     #
     # To make "strip *.so.*" not fail (ptxdist does this), rename to .so_orig rather than .so.orig
@@ -505,11 +499,7 @@
             if [ -f "${CT_SYSROOT_DIR}/${dir}/${file}" -a ! -L ${CT_SYSROOT_DIR}/$lib/$file ]; then
                 CT_DoExecLog ALL cp -v "${CT_SYSROOT_DIR}/${dir}/${file}" "${CT_SYSROOT_DIR}/${dir}/${file}_orig"
                 CT_DoLog DEBUG "Fixing '${CT_SYS_ROOT_DIR}/${dir}/${file}'"
-                CT_DoExecLog ALL sed -i -r -e 's,/usr/lib/,,g;
-                                               s,/usr/lib64/,,g;
-                                               s,/lib/,,g;
-                                               s,/lib64/,,g;
-                                               /BUG in libc.scripts.output-format.sed/d' "${CT_SYSROOT_DIR}/${dir}/${file}"
+                CT_DoExecLog ALL sed -i -r -e '/BUG in libc.scripts.output-format.sed/d' "${CT_SYSROOT_DIR}/${dir}/${file}"
             fi
         done
     done