summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-09-23 14:48:10 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-09-23 14:48:10 (GMT)
commit6c54fde8fd1b4e5896c88afac0076481e36c31d0 (patch)
treef02afced4e4d0c85fb06475cf4dc625ed50b3f8b /scripts
parentd5dd879b6395b62b5c284c4fa451df032927c265 (diff)
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(-)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/libc/glibc.sh14
1 files changed, 2 insertions, 12 deletions
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 4873ed0..2f78007 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -489,13 +489,7 @@ do_libc() {
# 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 @@ do_libc() {
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