OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc

This commit is contained in:
Ulrich Drepper 2011-09-11 15:02:32 -04:00
parent 83cd142045 0f31fe7791
commit 773523e08d
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-09-11 Andreas Schwab <schwab@linux-m68k.org>
* elf/Makefile (gen-ldd): Prepend $(..) to $(ldd-rewrite-script)
if non-absolute.
* sysdeps/unix/sysv/linux/configure.in: Remove leading ../ from
ldd_rewrite_script.
* sysdeps/unix/sysv/linux/configure: Regenerated.
2011-09-11 Ulrich Drepper <drepper@gmail.com>
* configure.in: Remove --with-tls option.

3
elf/Makefile
View File

@ -482,7 +482,8 @@ LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< > $@.new
endef
else
define gen-ldd
LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< | LC_ALL=C sed -f $(ldd-rewrite-script) > $@.new
LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< \
| LC_ALL=C sed -f $(patsubst $(..)/,/,$(..)$(ldd-rewrite-script)) > $@.new
endef
endif

12
sysdeps/unix/sysv/linux/configure vendored
View File

@ -485,22 +485,22 @@ use_ldconfig=yes
case "$machine" in
i[3456]86* | m68*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
;;
ia64*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
;;
s390*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
;;
sparc*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
;;
x86_64*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
;;
powerpc*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
;;
*)
;;

12
sysdeps/unix/sysv/linux/configure.in
View File

@ -224,22 +224,22 @@ use_ldconfig=yes
changequote(,)
case "$machine" in
i[3456]86* | m68*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/ldd-rewrite.sed
;;
ia64*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
;;
s390*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed
;;
sparc*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/sparc/ldd-rewrite.sed
;;
x86_64*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
;;
powerpc*)
ldd_rewrite_script=../sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
ldd_rewrite_script=sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed
;;
*)
;;