mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 15:20:10 +00:00
cf197e41e7
2000-04-02 Ulrich Drepper <drepper@redhat.com>
* elf/dl-fini.c (_dl_fini): Increment j counter after swapping in
element at this position.
* elf/Versions [ld.so] (GLIBC_2.2): Export _dl_load_lock.
* elf/link.h (struct link_map): Add l_reldepsmax, l_reldepsact, and
l_reldeps elements.
* elf/dl-lookup.c (add_dependency): New function.
(_dl_lookup_symbol): Use it whenever symbol was found in a global,
dynamically loaded object.
(_dl_lookup_symbol_skip): Likewise.
(_dl_lookup_versioned_symbol): Likewise.
(_dl_lookup_versioned_symbol_skip): Likewise.
* elf/dl-open.c: Don't define _dl_load_lock here...
* elf/rtld.c: ...but here...
* elf/dl-support.c: ...and here.
* elf/dl-close.c (_dl_close): Close also dependent objects introduce
through relocation.
* elf/dl-fini.c (_dl_fini): Also take dependencies introduced through
relocations.
* dlfcn/Makefile (glrefmain.out): Test is not expected to fail
anymore.
* dlfcn/glrefmain.c: Add one more debug message.
* Makeconfig (preprocess-versions): Don't add $(CPPFLAGS) to compiler
command line.
* Makerules (sysd-versions): Use ( ) instead of { }.
* elf/dl-load.c: Use __builtin_expect to signal that compiler should
optimize for the non-debugging case.
* elf/dl-lookup.c: Likewise.
* sysdeps/generic/libc-start.c: Likewise.
80 lines
2.0 KiB
C
80 lines
2.0 KiB
C
/* Test for dependency tracking added by relocations.
|
|
Copyright (C) 2000 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <dlfcn.h>
|
|
#include <error.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
|
|
static void *
|
|
load (const char *name)
|
|
{
|
|
void *d = dlopen (name, RTLD_LAZY | RTLD_GLOBAL);
|
|
if (d == NULL)
|
|
error (EXIT_FAILURE, errno, "cannot load `%s'", name);
|
|
return d;
|
|
}
|
|
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
int
|
|
do_test (void)
|
|
{
|
|
void *d1;
|
|
void *d2;
|
|
int (*f) (void);
|
|
|
|
d1 = load ("glreflib1.so");
|
|
d2 = load ("glreflib2.so");
|
|
|
|
f = dlsym (d2, "ref2");
|
|
if (f == NULL)
|
|
error (EXIT_FAILURE, errno, "cannot get pointer to `%s'", "ref2");
|
|
|
|
if (f () != 42)
|
|
error (EXIT_FAILURE, 0, "wrong result from `%s'", "ref2");
|
|
|
|
puts ("Correct result in first call");
|
|
fflush (stdout);
|
|
|
|
/* Now unload the first file. */
|
|
dlclose (d1);
|
|
|
|
puts ("About to call the second time");
|
|
fflush (stdout);
|
|
|
|
/* Try calling the function again. */
|
|
if (f () != 42)
|
|
error (EXIT_FAILURE, 0, "wrong result from `%s' (second call)", "ref2");
|
|
|
|
puts ("Second call succeeded!");
|
|
fflush (stdout);
|
|
|
|
dlclose (d2);
|
|
|
|
puts ("glreflib2 also closed");
|
|
fflush (stdout);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#include "../test-skeleton.c"
|