diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2021-10-15 06:33:05 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2022-01-24 05:11:36 -0800 |
commit | 114d07fd9a54684cb67b02174f2c48d19f3e2502 (patch) | |
tree | d2d840cfe3146ab1079b9054ca3b0c43240d79b1 /elf | |
parent | 976db046bc3a3738f69255ae00b0a09b8e77fd9c (diff) | |
download | glibc-114d07fd9a54684cb67b02174f2c48d19f3e2502.zip glibc-114d07fd9a54684cb67b02174f2c48d19f3e2502.tar.gz glibc-114d07fd9a54684cb67b02174f2c48d19f3e2502.tar.bz2 |
Add and use link-test-modules-rpath-link [BZ #28455]
DT_RUNPATH is only used to find the immediate dependencies of the
executable or shared object containing the DT_RUNPATH entry:
1. Define link-test-modules-rpath-link if $(build-hardcoded-path-in-tests)
is yes.
2. Use $(link-test-modules-rpath-link) in build-module-helper so that
test modules can dlopen modules with DT_RUNPATH.
3. Add a test to show why link-test-modules-rpath-link is needed.
This partially fixes BZ #28455.
Diffstat (limited to 'elf')
-rw-r--r-- | elf/Makefile | 7 | ||||
-rw-r--r-- | elf/tst-global2.c | 32 | ||||
-rw-r--r-- | elf/tst-globalmod2.c | 41 |
3 files changed, 80 insertions, 0 deletions
diff --git a/elf/Makefile b/elf/Makefile index 6cc53c3..a749ef6 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -402,6 +402,7 @@ tests += \ tst-glibc-hwcaps-mask \ tst-glibc-hwcaps-prepend \ tst-global1 \ + tst-global2 \ tst-initfinilazyfail \ tst-initorder \ tst-initorder2 \ @@ -716,6 +717,7 @@ modules-names = \ tst-filterobj-filtee \ tst-filterobj-flt \ tst-finilazyfailmod \ + tst-globalmod2 \ tst-initlazyfailmod \ tst-initorder2a \ tst-initorder2b \ @@ -1863,6 +1865,11 @@ tst-audit8-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so +$(objpfx)tst-global2: $(objpfx)tst-globalmod2.so +$(objpfx)tst-global2.out: $(objpfx)reldepmod1.so $(objpfx)reldepmod4.so +LDFLAGS-tst-global2 = -Wl,--enable-new-dtags +LDFLAGS-tst-globalmod2.so = -Wl,--enable-new-dtags + $(objpfx)order2.out: $(objpfx)order2mod1.so $(objpfx)order2mod2.so $(objpfx)order2-cmp.out: $(objpfx)order2.out (echo "12345" | cmp $< -) > $@; \ diff --git a/elf/tst-global2.c b/elf/tst-global2.c new file mode 100644 index 0000000..9cbfae0 --- /dev/null +++ b/elf/tst-global2.c @@ -0,0 +1,32 @@ +/* Test BZ #28455. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +/* In glibc configured with --enable-hardcoded-path-in-tests, a test + program built with -Wl,--enable-new-dtags, which adds DT_RUNPATH, + instead of DT_RPATH, can call a function in a shared library, which + dlopens another shared library. */ + +extern int test (void); + +static int +do_test (void) +{ + return test (); +} + +#include <support/test-driver.c> diff --git a/elf/tst-globalmod2.c b/elf/tst-globalmod2.c new file mode 100644 index 0000000..4de8405 --- /dev/null +++ b/elf/tst-globalmod2.c @@ -0,0 +1,41 @@ +/* Test BZ #28455. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +/* In glibc configured with --enable-hardcoded-path-in-tests, a test + program built with -Wl,--enable-new-dtags, which adds DT_RUNPATH, + instead of DT_RPATH, can call a function in a shared library, which + dlopens another shared library. */ + +#include <dlfcn.h> +#include <stdio.h> +#include <stdlib.h> + +extern int test (void); + +int +test (void) +{ + (void) dlopen ("reldepmod4.so", RTLD_LAZY | RTLD_GLOBAL); + if (dlsym (RTLD_DEFAULT, "call_me") != NULL) + { + puts ("found \"call_me\""); + return EXIT_SUCCESS; + } + puts ("didn't find \"call_me\""); + return EXIT_FAILURE; +} |