diff options
| author |   Andreas Schwab <schwab@redhat.com> | 2009-07-30 14:18:37 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-30 14:18:37 +0200 |
| commit | b870de510d54108c7c839abc17ea1559085e55a3 (patch) | |
| tree | d59aca63c9713ac51b929e388187f6ec0bb1273e /elf/dl-lookup.c | |
| parent | Ignore pkgs-import. (diff) | |
| parent | Add support for x86-64 fma instruction. (diff) | |
| download | glibc-b870de510d54108c7c839abc17ea1559085e55a3.tar.gz glibc-b870de510d54108c7c839abc17ea1559085e55a3.tar.bz2 glibc-b870de510d54108c7c839abc17ea1559085e55a3.zip | |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'elf/dl-lookup.c')
| -rw-r--r-- | elf/dl-lookup.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 1d68d67a35..56724c9b4d 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -380,6 +380,10 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash, if (size * 3 <= tab->n_elements * 4) { /* Expand the table. */ +#ifdef RTLD_CHECK_FOREIGN_CALL + /* This must not happen during runtime relocations. */ + assert (!RTLD_CHECK_FOREIGN_CALL); +#endif size_t newsize = _dl_higher_prime_number (size + 1); struct unique_sym *newentries = calloc (sizeof (struct unique_sym), newsize); @@ -405,6 +409,11 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash, } else { +#ifdef RTLD_CHECK_FOREIGN_CALL + /* This must not happen during runtime relocations. */ + assert (!RTLD_CHECK_FOREIGN_CALL); +#endif + #define INITIAL_NUNIQUE_SYM_TABLE 31 size = INITIAL_NUNIQUE_SYM_TABLE; entries = calloc (sizeof (struct unique_sym), size); @@ -600,6 +609,10 @@ add_dependency (struct link_map *undef_map, struct link_map *map, int flags) unsigned int max = undef_map->l_reldepsmax ? undef_map->l_reldepsmax * 2 : 10; +#ifdef RTLD_PREPARE_FOREIGN_CALL + RTLD_PREPARE_FOREIGN_CALL; +#endif + newp = malloc (sizeof (*newp) + max * sizeof (struct link_map *)); if (newp == NULL) { |