qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing $(rpath-link) to elf/ld.so --library-path 

This is notably needed for GNU/Hurd's libmachuser.so and libhurduser.so.
This commit is contained in:
Samuel Thibault 2025-11-08 21:47:25 +01:00
parent 4b5eeec17b
commit 23db68ed9d
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elf/Makefile
View File

@ -1913,7 +1913,7 @@ $(objpfx)lateglobal.out: $(objpfx)ltglobmod1.so $(objpfx)ltglobmod2.so
$(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \ $(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \
$(objpfx)pathoptobj.so $(objpfx)pathoptobj.so
$(SHELL) $< $(common-objpfx) '$(test-wrapper-env)' \ $(SHELL) $< $(common-objpfx) '$(test-wrapper-env)' \
'$(run-program-env)'; \ '$(run-program-env)' '$(rpath-link)' ; \
$(evaluate-test) $(evaluate-test)
$(objpfx)tst-rtld-load-self.out: tst-rtld-load-self.sh $(objpfx)ld.so $(objpfx)tst-rtld-load-self.out: tst-rtld-load-self.sh $(objpfx)ld.so

4
elf/tst-pathopt.sh
View File

@ -22,6 +22,8 @@ set -e
common_objpfx=$1 common_objpfx=$1
test_wrapper_env=$2 test_wrapper_env=$2
run_program_env=$3 run_program_env=$3
# Remove the last space to allow concatenate extra paths.
library_path=$(echo $4)
test -e ${common_objpfx}elf/will-be-empty && test -e ${common_objpfx}elf/will-be-empty &&
rm -fr ${common_objpfx}elf/will-be-empty rm -fr ${common_objpfx}elf/will-be-empty
@ -32,7 +34,7 @@ cp ${common_objpfx}elf/pathoptobj.so ${common_objpfx}elf/for-renamed/renamed.so
${test_wrapper_env} \ ${test_wrapper_env} \
${run_program_env} \ ${run_program_env} \
LD_LIBRARY_PATH=${common_objpfx}elf/will-be-empty:${common_objpfx}elf/for-renamed:${common_objpfx}.:${common_objpfx}dlfcn \ LD_LIBRARY_PATH=$library_path:${common_objpfx}elf/will-be-empty:${common_objpfx}elf/for-renamed:${common_objpfx}.:${common_objpfx}dlfcn \
${common_objpfx}elf/ld.so ${common_objpfx}elf/tst-pathopt \ ${common_objpfx}elf/ld.so ${common_objpfx}elf/tst-pathopt \
> ${common_objpfx}elf/tst-pathopt.out > ${common_objpfx}elf/tst-pathopt.out

6
scripts/dso-ordering-test.py
View File

@ -748,7 +748,7 @@ def process_testcase(t):
("${test_wrapper_env} ${run_program_env} %s\\\n" ("${test_wrapper_env} ${run_program_env} %s\\\n"
"${common_objpfx}support/test-run-command \\\n" "${common_objpfx}support/test-run-command \\\n"
"${common_objpfx}elf/ld.so \\\n" "${common_objpfx}elf/ld.so \\\n"
"--library-path ${common_objpfx}elf/%s:" "--library-path $library_path:${common_objpfx}elf/%s:"
"${common_objpfx}elf:${common_objpfx}.:" "${common_objpfx}elf:${common_objpfx}.:"
"${common_objpfx}dlfcn \\\n" "${common_objpfx}dlfcn \\\n"
"${common_objpfx}elf/%s/%s > \\\n" "${common_objpfx}elf/%s/%s > \\\n"
@ -1021,6 +1021,8 @@ def process_testcase(t):
t.sh.write("common_objpfx=$1\n") t.sh.write("common_objpfx=$1\n")
t.sh.write("test_wrapper_env=$2\n") t.sh.write("test_wrapper_env=$2\n")
t.sh.write("run_program_env=$3\n") t.sh.write("run_program_env=$3\n")
# Remove the last space to allow concatenate extra paths.
t.sh.write("library_path=$(echo $4)\n")
t.sh.write("something_failed=false\n") t.sh.write("something_failed=false\n")
# Starting part of Makefile fragment # Starting part of Makefile fragment
@ -1050,7 +1052,7 @@ def process_testcase(t):
% (t.test_name, test_srcdir, t.test_name, % (t.test_name, test_srcdir, t.test_name,
expected_output_files)) expected_output_files))
makefile.write("\t$(SHELL) $< $(common-objpfx) '$(test-wrapper-env)' " makefile.write("\t$(SHELL) $< $(common-objpfx) '$(test-wrapper-env)' "
"'$(run-program-env)' > $@; $(evaluate-test)\n") "'$(run-program-env)' '$(rpath-link)' > $@; $(evaluate-test)\n")
makefile.write("ifeq ($(run-built-tests),yes)\n") makefile.write("ifeq ($(run-built-tests),yes)\n")
if t.xtest: if t.xtest:
makefile.write("xtests-special += $(objpfx)%s.out\n" % (t.test_name)) makefile.write("xtests-special += $(objpfx)%s.out\n" % (t.test_name))