* elf/Makefile (tests): Add $(tests-nodelete-$(have-z-nodelete)).
(tests-nodelete-yes): Define.
(modules-names): Add $(modules-nodelete-$(have-z-nodelete)).
Add rules to build nodelete and modules.
* elf/nodelete.c: New file.
* elf/nodelmod1.c: New file.
* elf/nodelmod2.c: New file.
* configure.in: Add test for -z nodelete option.
* config.make.in: Define have-z-nodelete with libc_cv_z_nodelete.
* include/link.h (struct link_map): Add l_feature_1 and l_flags_1.
* sysdeps/generic/bits/dlfcn.h: Define RTLD_NOLOAD and RTLD_NODELETE.
* sysdeps/mips/bits/dlfcn.h: Likewise.
+ * elf/Makefile (tests): Add $(tests-nodelete-$(have-z-nodelete)).
+ (tests-nodelete-yes): Define.
+ (modules-names): Add $(modules-nodelete-$(have-z-nodelete)).
+ Add rules to build nodelete and modules.
+ * elf/nodelete.c: New file.
+ * elf/nodelmod1.c: New file.
+ * elf/nodelmod2.c: New file.
+ * configure.in: Add test for -z nodelete option.
+ * config.make.in: Define have-z-nodelete with libc_cv_z_nodelete.
* libio/Makefile (tests): Add tst_wprintf2.
(tst_wprintf2-ARGS): Define.
elf = @elf@
have-protected = @libc_cv_asm_protected_directive@
+have-z-nodelete = @libc_cv_z_nodelete@
have-initfini = @libc_cv_have_initfini@
need-nopic-initfini = @nopic_initfini@
with-cvs = @with_cvs@
fi
rm -f conftest*])
AC_SUBST(libc_cv_asm_protected_directive)
+
+ AC_CACHE_CHECK(for -z nodelete option,
+ libc_cv_z_nodelete, [dnl
+ cat > conftest.c <<EOF
+int _start (void) { return 42; }
+EOF
+ if AC_TRY_COMMAND([${CC-cc} -shared -o conftest.so conftest.c -Wl,--enable-new-dtags,-z,nodelete 1>&AC_FD_CC])
+ then
+ libc_cv_z_nodelete=yes
+ else
+ libc_cv_z_nodelete=no
+ fi
+ rm -f conftest*])
+ AC_SUBST(libc_cv_z_nodelete)
fi
if test $elf != yes; then
ifeq (yes,$(build-shared))
tests = loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- constload1 order $(tests-vis-$(have-protected)) noload
+ constload1 order $(tests-vis-$(have-protected)) noload \
+ $(tests-nodelete-$(have-z-nodelete))
tests-vis-yes = vismain
+tests-nodelete-yes = nodelete
endif
modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
testobj1_1 failobj constload2 constload3 \
- dep1 dep2 dep3 dep4 $(modules-vis-$(have-protected))
+ dep1 dep2 dep3 dep4 $(modules-vis-$(have-protected)) \
+ $(modules-nodelete-$(have-z-nodelete))
modules-vis-yes = vismod1 vismod2 vismod3
+modules-nodelete-yes = nodelmod1 nodelmod2
extra-objs += $(addsuffix .os,$(strip $(modules-names)))
include ../Rules
$(objpfx)noload: $(objpfx)testobj1.so
LDFLAGS-noload = -rdynamic
$(objpfx)noload.out: $(objpfx)testobj5.so
+
+LDFLAGS-nodelmod1.so = -Wl,--enable-new-dtags,-z,nodelete
+$(objpfx)nodelete: $(libdl)
+$(objpfx)nodelete.out: $(objpfx)nodelmod1.so $(objpfx)nodelmod2.so
--- /dev/null
+#include <dlfcn.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+
+
+static sigjmp_buf jmpbuf;
+
+
+static void
+handler (int sig)
+{
+ siglongjmp (jmpbuf, 1);
+}
+
+
+#define TEST_FUNCTION do_test ()
+static int
+do_test (void)
+{
+ /* We are testing the two possibilities to mark an object as not deletable:
+ - marked on the linker commandline with `-z nodelete'
+ - with the RTLD_NODELETE flag at dlopen()-time.
+
+ The test we are performing should be safe. We are loading the objects,
+ get the address of variables in the respective object, unload the object
+ and then try to read the variable. If the object is unloaded this
+ should lead to an segmentation fault. */
+ int result = 0;
+ void *p;
+ struct sigaction sa;
+
+ sa.sa_handler = handler;
+ sigfillset (&sa.sa_mask);
+ sa.sa_flags = SA_RESTART;
+ sa.sa_restorer = NULL;
+
+ if (sigaction (SIGSEGV, &sa, NULL) == -1)
+ printf ("cannot install signal handler: %m\n");
+
+ p = dlopen ("nodelmod1.so", RTLD_LAZY);
+ if (p == NULL)
+ {
+ puts ("failed to load \"nodelmod1.so\"");
+ result = 1;
+ }
+ else
+ {
+ int *varp;
+
+ puts ("succeeded loading \"nodelmod1.so\"");
+
+ varp = dlsym (p, "var1");
+ if (varp == NULL)
+ {
+ puts ("failed to get address of \"var1\" in \"nodelmod1.so\"");
+ result = 1;
+ }
+ else
+ {
+ *varp = 20000720;
+
+ /* Now close the object. */
+ if (dlclose (p) != 0)
+ {
+ puts ("failed to close \"nodelmod1.so\"");
+ result = 1;
+ }
+ else if (! sigsetjmp (jmpbuf, 1))
+ {
+ /* Access the variable again. */
+ if (*varp != 20000720)
+ {
+ puts ("\"var1\" value not correct");
+ result = 1;
+ }
+ else
+ puts ("-z nodelete test succeeded");
+ }
+ else
+ {
+ /* We caught an segmentation fault. */
+ puts ("\"nodelmod1.so\" got deleted");
+ result = 1;
+ }
+ }
+ }
+
+ p = dlopen ("nodelmod2.so", RTLD_LAZY | RTLD_NODELETE);
+ if (p == NULL)
+ {
+ puts ("failed to load \"nodelmod2.so\"");
+ result = 1;
+ }
+ else
+ {
+ int *varp;
+
+ puts ("succeeded loading \"nodelmod2.so\"");
+
+ varp = dlsym (p, "var2");
+ if (varp == NULL)
+ {
+ puts ("failed to get address of \"var2\" in \"nodelmod2.so\"");
+ result = 1;
+ }
+ else
+ {
+ *varp = 42;
+
+ /* Now close the object. */
+ if (dlclose (p) != 0)
+ {
+ puts ("failed to close \"nodelmod2.so\"");
+ result = 1;
+ }
+ else if (! sigsetjmp (jmpbuf, 1))
+ {
+ /* Access the variable again. */
+ if (*varp != 42)
+ {
+ puts ("\"var2\" value not correct");
+ result = 1;
+ }
+ else
+ puts ("RTLD_NODELETE test succeeded");
+ }
+ else
+ {
+ /* We caught an segmentation fault. */
+ puts ("\"nodelmod2.so\" got deleted");
+ result = 1;
+ }
+ }
+ }
+
+ return result;
+}
+
+#include "../test-skeleton.c"
--- /dev/null
+int var1 = 42;
--- /dev/null
+int var2 = 100;
+2000-07-20 Ulrich Drepper <drepper@redhat.com>
+
+ * Makefile: Pass -z nodelete to linker for libpthread.so
+ generation if it understand this option.
+
2000-07-18 Mark Kettenis <kettenis@gnu.org>
* manager.c (pthread_handle_create): Remove initialization of
semaphore spinlock wrapsyscall rwlock pt-machine \
oldsemaphore events getcpuclockid pspinlock barrier
+nodelete-yes = -Wl,--enable-new-dtags,-z,nodelete
+LDFLAGS-pthread.so = $(nodelete-$(have-z-nodelete))
+
vpath %.c Examples
tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 ex10 ex11 joinrace
projects / platform / upstream / glibc.git / commitdiff