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

Update. 

1999-02-07  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dl-lookup.c: Increment _dl_num_relocations in the four entry
	point functions, not do_lookup since the later can be called more
	than once.
This commit is contained in:
Ulrich Drepper 1999-02-07 21:21:33 +00:00
parent e1f601e878
commit 48f6496e3f
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
1999-02-07 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-lookup.c: Increment _dl_num_relocations in the four entry
point functions, not do_lookup since the later can be called more
than once.
1999-02-03 Jakub Jelinek <jj@ultra.linux.cz>
* sysdeps/generic/segfault.c: Add ADVANCE_STACK_FRAME

14
elf/dl-lookup.c
View File

@ -1,5 +1,5 @@
/* Look up a symbol in the loaded objects.
Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
Copyright (C) 1995, 1996, 1997, 1998, 1999 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
@ -74,8 +74,6 @@ do_lookup (const char *undef_name, unsigned long int hash,
size_t n = scope->r_nlist;
struct link_map *map;
++_dl_num_relocations;
for (; i < n; ++i)
{
const ElfW(Sym) *symtab;
@ -189,7 +187,7 @@ do_lookup (const char *undef_name, unsigned long int hash,
goto found_it;
}
/* If we have seem exactly one versioned symbol while we are
/* If we have seen exactly one versioned symbol while we are
looking for an unversioned symbol and the version is not the
default version we still accept this symbol since there are
no possible ambiguities. */
@ -244,6 +242,8 @@ _dl_lookup_symbol (const char *undef_name, const ElfW(Sym) **ref,
struct sym_val current_value = { NULL, NULL };
struct r_scope_elem **scope;
++_dl_num_relocations;
/* Search the relevant loaded objects for a definition. */
for (scope = symbol_scope; *scope; ++scope)
if (do_lookup (undef_name, hash, *ref, &current_value,
@ -293,6 +293,8 @@ _dl_lookup_symbol_skip (const char *undef_name, const ElfW(Sym) **ref,
struct r_scope_elem **scope;
size_t i;
++_dl_num_relocations;
/* Search the relevant loaded objects for a definition. */
scope = symbol_scope;
for (i = 0; (*scope)->r_duplist[i] != skip_map; ++i)
@ -342,6 +344,8 @@ _dl_lookup_versioned_symbol (const char *undef_name, const ElfW(Sym) **ref,
struct sym_val current_value = { NULL, NULL };
struct r_scope_elem **scope;
++_dl_num_relocations;
/* Search the relevant loaded objects for a definition. */
for (scope = symbol_scope; *scope; ++scope)
{
@ -409,6 +413,8 @@ _dl_lookup_versioned_symbol_skip (const char *undef_name,
struct r_scope_elem **scope;
size_t i;
++_dl_num_relocations;
/* Search the relevant loaded objects for a definition. */
scope = symbol_scope;
for (i = 0; (*scope)->r_duplist[i] != skip_map; ++i)

16
sysdeps/generic/segfault.c
View File

@ -1,5 +1,5 @@
/* Catch segmentation faults and print backtrace.
Copyright (C) 1998 Free Software Foundation, Inc.
Copyright (C) 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@ -61,9 +61,15 @@ extern void *__libc_stack_end;
# define INNER_THAN <
#endif
/* By default assume the `next' pointer in struct layout points to the
next struct layout. */
#ifndef ADVANCE_STACK_FRAME
# define ADVANCE_STACK_FRAME(next) ((struct layout *) (next))
#endif
struct layout
{
struct layout *next;
void *next;
void *return_address;
};
@ -118,7 +124,7 @@ catch_segfault (int signal, SIGCONTEXT ctx)
{
++cnt;
current = current->next;
current = ADVANCE_STACK_FRAME (current->next);
}
arr = alloca (cnt * sizeof (void *));
@ -133,7 +139,7 @@ catch_segfault (int signal, SIGCONTEXT ctx)
{
arr[cnt++] = current->return_address;
current = current->next;
current = ADVANCE_STACK_FRAME (current->next);
}
/* If the last return address was NULL, assume that it doesn't count. */
@ -179,7 +185,7 @@ install_handler (void)
sa.sa_flags |= SA_ONSTACK;
}
}
if (sigs == NULL)
sigaction (SIGSEGV, &sa, NULL);
else if (sigs[0] == '\0')